X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4996f26121bacb8ce4dc4a0f00c638f6b6b802bb..5e0dbc8dd94d7ba16cb97cb050c9588db4c3a12f:/build/msw/makefile.wat diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index f60c791e4f..6e96922b02 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 & @@ -151,7 +151,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 +160,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 +180,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_window.obj & + $(OBJS)\monodll_automtn.obj & + $(OBJS)\monodll_uuid.obj & + $(OBJS)\monodll_dirdlg.obj & $(OBJS)\monodll_statusbr.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_accel.obj & @@ -198,9 +196,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_control.obj & $(OBJS)\monodll_dialog.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 +228,10 @@ ____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_helpchm.obj & + $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_accesscmn.obj & $(OBJS)\monodll_appcmn.obj & $(OBJS)\monodll_artprov.obj & @@ -240,7 +240,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 & @@ -347,7 +346,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 +355,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 +375,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_window.obj & + $(OBJS)\monodll_automtn.obj & + $(OBJS)\monodll_uuid.obj & + $(OBJS)\monodll_dirdlg.obj & $(OBJS)\monodll_accel.obj & $(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_dirdlgg.obj & @@ -438,7 +435,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 & @@ -549,9 +545,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 & @@ -597,7 +593,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 +602,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 +622,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_window.obj & + $(OBJS)\monolib_automtn.obj & + $(OBJS)\monolib_uuid.obj & + $(OBJS)\monolib_dirdlg.obj & $(OBJS)\monolib_statusbr.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_accel.obj & @@ -644,9 +638,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_control.obj & $(OBJS)\monolib_dialog.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 +670,10 @@ ____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_helpchm.obj & + $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_accesscmn.obj & $(OBJS)\monolib_appcmn.obj & $(OBJS)\monolib_artprov.obj & @@ -686,7 +682,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 & @@ -793,7 +788,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 +797,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 +817,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_window.obj & + $(OBJS)\monolib_automtn.obj & + $(OBJS)\monolib_uuid.obj & + $(OBJS)\monolib_dirdlg.obj & $(OBJS)\monolib_accel.obj & $(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_dirdlgg.obj & @@ -884,7 +877,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 & @@ -977,7 +969,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 +983,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 +998,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 +1021,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 +1030,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 +1050,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_window.obj & + $(OBJS)\coredll_automtn.obj & + $(OBJS)\coredll_uuid.obj & + $(OBJS)\coredll_dirdlg.obj & $(OBJS)\coredll_statusbr.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_accel.obj & @@ -1076,9 +1066,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_control.obj & $(OBJS)\coredll_dialog.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 +1098,10 @@ ____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_helpchm.obj & + $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_accesscmn.obj & $(OBJS)\coredll_appcmn.obj & $(OBJS)\coredll_artprov.obj & @@ -1118,7 +1110,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 & @@ -1225,7 +1216,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 +1225,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 +1245,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_window.obj & + $(OBJS)\coredll_automtn.obj & + $(OBJS)\coredll_uuid.obj & + $(OBJS)\coredll_dirdlg.obj & $(OBJS)\coredll_accel.obj & $(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_dirdlgg.obj & @@ -1316,7 +1305,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 & @@ -1433,7 +1421,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 +1430,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 +1450,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_window.obj & + $(OBJS)\corelib_automtn.obj & + $(OBJS)\corelib_uuid.obj & + $(OBJS)\corelib_dirdlg.obj & $(OBJS)\corelib_statusbr.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_accel.obj & @@ -1480,9 +1466,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_control.obj & $(OBJS)\corelib_dialog.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 +1498,10 @@ ____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_helpchm.obj & + $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_accesscmn.obj & $(OBJS)\corelib_appcmn.obj & $(OBJS)\corelib_artprov.obj & @@ -1522,7 +1510,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 & @@ -1629,7 +1616,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 +1625,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 +1645,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_window.obj & + $(OBJS)\corelib_automtn.obj & + $(OBJS)\corelib_uuid.obj & + $(OBJS)\corelib_dirdlg.obj & $(OBJS)\corelib_accel.obj & $(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_dirdlgg.obj & @@ -1720,7 +1705,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 & @@ -1814,7 +1798,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 +1816,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 +1835,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 +1856,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 +1873,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 = @@ -1904,7 +1888,7 @@ __gldll___depname = !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 +1915,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 @@ -2039,7 +2023,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & 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 = & @@ -2063,10 +2048,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 +2176,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 +2195,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 & @@ -2291,6 +2274,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 +2293,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 & @@ -2390,6 +2373,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 +2392,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 & @@ -2473,6 +2456,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 +2475,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 & @@ -2655,9 +2638,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 +2660,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 & @@ -2839,34 +2822,34 @@ 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)_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 +2896,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 +2922,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 +2948,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 +2975,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 +3005,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 +3035,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 +3066,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 +3099,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 +3128,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 @@ -3172,12 +3155,12 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib : $(XMLLIB_OBJECTS !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 +3205,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 +3270,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 +3582,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 +3639,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) $< @@ -3857,9 +3834,6 @@ $(OBJS)\monodll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3911,6 +3885,15 @@ $(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_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4013,15 +3996,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) $< @@ -4178,11 +4161,6 @@ $(OBJS)\monodll_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !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 $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4228,16 +4206,6 @@ $(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 - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4248,11 +4216,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 +4236,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 +4306,21 @@ $(OBJS)\monodll_window.obj : .AUTODEPEND ..\..\src\msw\window.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 +$(OBJS)\monodll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.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 +4466,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 +4662,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 +4716,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) $< @@ -5184,6 +5152,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 +5209,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) $< @@ -5436,9 +5404,6 @@ $(OBJS)\monolib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5490,6 +5455,15 @@ $(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_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5592,15 +5566,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) $< @@ -5757,11 +5731,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) $< @@ -5807,16 +5776,6 @@ $(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 - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5827,11 +5786,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 +5806,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 +5876,21 @@ $(OBJS)\monolib_window.obj : .AUTODEPEND ..\..\src\msw\window.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 +$(OBJS)\monolib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.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 +6036,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 +6232,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 +6286,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) $< @@ -6763,6 +6722,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 +6779,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) $< @@ -6976,6 +6935,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 +6992,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) $< @@ -7294,9 +7253,6 @@ $(OBJS)\coredll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -7348,6 +7304,15 @@ $(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_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -7492,11 +7457,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) $< @@ -7542,16 +7502,6 @@ $(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 - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -7562,11 +7512,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 +7532,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 +7602,21 @@ $(OBJS)\coredll_window.obj : .AUTODEPEND ..\..\src\msw\window.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 +$(OBJS)\coredll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.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 +7762,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 +7958,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 +8012,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) $< @@ -8525,9 +8475,6 @@ $(OBJS)\corelib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp $(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -8579,6 +8526,15 @@ $(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_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -8723,11 +8679,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) $< @@ -8773,16 +8724,6 @@ $(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 - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -8793,11 +8734,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 +8754,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 +8824,21 @@ $(OBJS)\corelib_window.obj : .AUTODEPEND ..\..\src\msw\window.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 +$(OBJS)\corelib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.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 +8984,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 +9180,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 +9234,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) $< @@ -9759,15 +9700,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 +9745,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) $<