X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1bdd4ab9bb8cdcf8a14b8a64a5f5508be48ba4c..10875c13e900e79a16a084cfa81bbc7dda2cd3b1:/build/msw/makefile.gcc?ds=sidebyside diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 17486f80eb..2474ededb4 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -181,7 +181,8 @@ WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -DNDEBUG -I..\..\src\stc\scintilla\include \ -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ -I$(SETUPHDIR) -I..\..\include $(__wxscintilla_usingdll_p) -D__WXMSW__ \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_AutoComplete.o \ $(OBJS)\wxscintilla_CallTip.o \ @@ -1141,6 +1142,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_choic.o \ $(OBJS)\xrcdll_xh_choicbk.o \ $(OBJS)\xrcdll_xh_clrpicker.o \ + $(OBJS)\xrcdll_xh_cmdlinkbn.o \ $(OBJS)\xrcdll_xh_collpane.o \ $(OBJS)\xrcdll_xh_combo.o \ $(OBJS)\xrcdll_xh_comboctrl.o \ @@ -1184,6 +1186,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_text.o \ $(OBJS)\xrcdll_xh_tglbtn.o \ $(OBJS)\xrcdll_xh_toolb.o \ + $(OBJS)\xrcdll_xh_toolbk.o \ $(OBJS)\xrcdll_xh_tree.o \ $(OBJS)\xrcdll_xh_treebk.o \ $(OBJS)\xrcdll_xh_unkwn.o \ @@ -1212,6 +1215,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_choic.o \ $(OBJS)\xrclib_xh_choicbk.o \ $(OBJS)\xrclib_xh_clrpicker.o \ + $(OBJS)\xrclib_xh_cmdlinkbn.o \ $(OBJS)\xrclib_xh_collpane.o \ $(OBJS)\xrclib_xh_combo.o \ $(OBJS)\xrclib_xh_comboctrl.o \ @@ -1255,6 +1259,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_text.o \ $(OBJS)\xrclib_xh_tglbtn.o \ $(OBJS)\xrclib_xh_toolb.o \ + $(OBJS)\xrclib_xh_toolbk.o \ $(OBJS)\xrclib_xh_tree.o \ $(OBJS)\xrclib_xh_treebk.o \ $(OBJS)\xrclib_xh_unkwn.o \ @@ -1401,7 +1406,8 @@ RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_richtextformatdlg.o \ $(OBJS)\richtextdll_richtextsymboldlg.o \ $(OBJS)\richtextdll_richtextstyledlg.o \ - $(OBJS)\richtextdll_richtextprint.o + $(OBJS)\richtextdll_richtextprint.o \ + $(OBJS)\richtextdll_richtextimagedlg.o RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1421,7 +1427,8 @@ RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_richtextformatdlg.o \ $(OBJS)\richtextlib_richtextsymboldlg.o \ $(OBJS)\richtextlib_richtextstyledlg.o \ - $(OBJS)\richtextlib_richtextprint.o + $(OBJS)\richtextlib_richtextprint.o \ + $(OBJS)\richtextlib_richtextimagedlg.o STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -1589,6 +1596,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_choic.o \ $(OBJS)\monodll_xh_choicbk.o \ $(OBJS)\monodll_xh_clrpicker.o \ + $(OBJS)\monodll_xh_cmdlinkbn.o \ $(OBJS)\monodll_xh_collpane.o \ $(OBJS)\monodll_xh_combo.o \ $(OBJS)\monodll_xh_comboctrl.o \ @@ -1632,6 +1640,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_text.o \ $(OBJS)\monodll_xh_tglbtn.o \ $(OBJS)\monodll_xh_toolb.o \ + $(OBJS)\monodll_xh_toolbk.o \ $(OBJS)\monodll_xh_tree.o \ $(OBJS)\monodll_xh_treebk.o \ $(OBJS)\monodll_xh_unkwn.o \ @@ -1672,6 +1681,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_richtextsymboldlg.o \ $(OBJS)\monodll_richtextstyledlg.o \ $(OBJS)\monodll_richtextprint.o \ + $(OBJS)\monodll_richtextimagedlg.o \ $(OBJS)\monodll_stc.o \ $(OBJS)\monodll_PlatWX.o \ $(OBJS)\monodll_ScintillaWX.o @@ -1764,9 +1774,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_notebook.o \ $(OBJS)\monodll_access.o \ $(OBJS)\monodll_ownerdrw.o \ + $(OBJS)\monodll_progdlg.o \ $(OBJS)\monodll_msw_radiobox.o \ $(OBJS)\monodll_msw_radiobut.o \ - $(OBJS)\monodll_richmsgdlg.o \ + $(OBJS)\monodll_richmsgdlg.o \ $(OBJS)\monodll_msw_scrolbar.o \ $(OBJS)\monodll_msw_slider.o \ $(OBJS)\monodll_msw_spinbutt.o \ @@ -1906,13 +1917,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ - $(OBJS)\monodll_msgdlgg.o \ + $(OBJS)\monodll_msgdlgg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ $(OBJS)\monodll_printps.o \ $(OBJS)\monodll_renderg.o \ - $(OBJS)\monodll_richmsgdlgg.o \ + $(OBJS)\monodll_richmsgdlgg.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ $(OBJS)\monodll_spinctlg.o \ @@ -2155,13 +2166,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ - $(OBJS)\monodll_msgdlgg.o \ + $(OBJS)\monodll_msgdlgg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ $(OBJS)\monodll_printps.o \ $(OBJS)\monodll_renderg.o \ - $(OBJS)\monodll_richmsgdlgg.o \ + $(OBJS)\monodll_richmsgdlgg.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ $(OBJS)\monodll_spinctlg.o \ @@ -2314,6 +2325,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_choic.o \ $(OBJS)\monolib_xh_choicbk.o \ $(OBJS)\monolib_xh_clrpicker.o \ + $(OBJS)\monolib_xh_cmdlinkbn.o \ $(OBJS)\monolib_xh_collpane.o \ $(OBJS)\monolib_xh_combo.o \ $(OBJS)\monolib_xh_comboctrl.o \ @@ -2357,6 +2369,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_text.o \ $(OBJS)\monolib_xh_tglbtn.o \ $(OBJS)\monolib_xh_toolb.o \ + $(OBJS)\monolib_xh_toolbk.o \ $(OBJS)\monolib_xh_tree.o \ $(OBJS)\monolib_xh_treebk.o \ $(OBJS)\monolib_xh_unkwn.o \ @@ -2397,6 +2410,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_richtextsymboldlg.o \ $(OBJS)\monolib_richtextstyledlg.o \ $(OBJS)\monolib_richtextprint.o \ + $(OBJS)\monolib_richtextimagedlg.o \ $(OBJS)\monolib_stc.o \ $(OBJS)\monolib_PlatWX.o \ $(OBJS)\monolib_ScintillaWX.o @@ -2489,9 +2503,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_notebook.o \ $(OBJS)\monolib_access.o \ $(OBJS)\monolib_ownerdrw.o \ + $(OBJS)\monolib_progdlg.o \ $(OBJS)\monolib_msw_radiobox.o \ $(OBJS)\monolib_msw_radiobut.o \ - $(OBJS)\monolib_richmsgdlg.o \ + $(OBJS)\monolib_richmsgdlg.o \ $(OBJS)\monolib_msw_scrolbar.o \ $(OBJS)\monolib_msw_slider.o \ $(OBJS)\monolib_msw_spinbutt.o \ @@ -2631,13 +2646,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ - $(OBJS)\monolib_msgdlgg.o \ + $(OBJS)\monolib_msgdlgg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ $(OBJS)\monolib_printps.o \ $(OBJS)\monolib_renderg.o \ - $(OBJS)\monolib_richmsgdlgg.o \ + $(OBJS)\monolib_richmsgdlgg.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ $(OBJS)\monolib_spinctlg.o \ @@ -2880,13 +2895,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ - $(OBJS)\monolib_msgdlgg.o \ + $(OBJS)\monolib_msgdlgg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ $(OBJS)\monolib_printps.o \ $(OBJS)\monolib_renderg.o \ - $(OBJS)\monolib_richmsgdlgg.o \ + $(OBJS)\monolib_richmsgdlgg.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ $(OBJS)\monolib_spinctlg.o \ @@ -3115,9 +3130,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_notebook.o \ $(OBJS)\coredll_access.o \ $(OBJS)\coredll_ownerdrw.o \ + $(OBJS)\coredll_progdlg.o \ $(OBJS)\coredll_msw_radiobox.o \ $(OBJS)\coredll_msw_radiobut.o \ - $(OBJS)\coredll_richmsgdlg.o \ + $(OBJS)\coredll_richmsgdlg.o \ $(OBJS)\coredll_msw_scrolbar.o \ $(OBJS)\coredll_msw_slider.o \ $(OBJS)\coredll_msw_spinbutt.o \ @@ -3257,13 +3273,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ - $(OBJS)\coredll_msgdlgg.o \ + $(OBJS)\coredll_msgdlgg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ $(OBJS)\coredll_printps.o \ $(OBJS)\coredll_renderg.o \ - $(OBJS)\coredll_richmsgdlgg.o \ + $(OBJS)\coredll_richmsgdlgg.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ $(OBJS)\coredll_spinctlg.o \ @@ -3506,13 +3522,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ - $(OBJS)\coredll_msgdlgg.o \ + $(OBJS)\coredll_msgdlgg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ $(OBJS)\coredll_printps.o \ $(OBJS)\coredll_renderg.o \ - $(OBJS)\coredll_richmsgdlgg.o \ + $(OBJS)\coredll_richmsgdlgg.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ $(OBJS)\coredll_spinctlg.o \ @@ -3625,9 +3641,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_notebook.o \ $(OBJS)\corelib_access.o \ $(OBJS)\corelib_ownerdrw.o \ + $(OBJS)\corelib_progdlg.o \ $(OBJS)\corelib_msw_radiobox.o \ $(OBJS)\corelib_msw_radiobut.o \ - $(OBJS)\corelib_richmsgdlg.o \ + $(OBJS)\corelib_richmsgdlg.o \ $(OBJS)\corelib_msw_scrolbar.o \ $(OBJS)\corelib_msw_slider.o \ $(OBJS)\corelib_msw_spinbutt.o \ @@ -3767,13 +3784,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ - $(OBJS)\corelib_msgdlgg.o \ + $(OBJS)\corelib_msgdlgg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ $(OBJS)\corelib_printps.o \ $(OBJS)\corelib_renderg.o \ - $(OBJS)\corelib_richmsgdlgg.o \ + $(OBJS)\corelib_richmsgdlgg.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ $(OBJS)\corelib_spinctlg.o \ @@ -4016,13 +4033,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ - $(OBJS)\corelib_msgdlgg.o \ + $(OBJS)\corelib_msgdlgg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ $(OBJS)\corelib_printps.o \ $(OBJS)\corelib_renderg.o \ - $(OBJS)\corelib_richmsgdlgg.o \ + $(OBJS)\corelib_richmsgdlgg.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ $(OBJS)\corelib_spinctlg.o \ @@ -4512,7 +4529,7 @@ endif endif endif ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__ +__WXUNIV_DEFINE_p_63 = --define __WXUNIVERSAL__ endif ifeq ($(DEBUG_FLAG),0) __DEBUG_DEFINE_p_61 = --define wxDEBUG_LEVEL=0 @@ -4530,10 +4547,10 @@ ifeq ($(USE_THREADS),0) __THREAD_DEFINE_p_61 = --define wxNO_THREADS endif ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_62 = --define wxUSE_UNICODE=0 +__UNICODE_DEFINE_p_63 = --define wxUSE_UNICODE=0 endif ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_62 = --define _UNICODE +__UNICODE_DEFINE_p_63 = --define _UNICODE endif ifeq ($(MSLU),1) __MSLU_DEFINE_p_61 = --define wxUSE_UNICODE_MSLU=1 @@ -6338,15 +6355,18 @@ $(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp $(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_progdlg.o: ../../src/msw/progdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_msw_radiobox.o: ../../src/msw/radiobox.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monodll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6686,6 +6706,9 @@ $(OBJS)\monodll_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp $(OBJS)\monodll_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_collpane.o: ../../src/xrc/xh_collpane.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6815,6 +6838,9 @@ $(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6935,6 +6961,9 @@ $(OBJS)\monodll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp $(OBJS)\monodll_richtextprint.o: ../../src/richtext/richtextprint.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7826,11 +7855,11 @@ $(OBJS)\monodll_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -7856,11 +7885,11 @@ $(OBJS)\monodll_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monodll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8106,7 +8135,7 @@ $(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp endif $(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL $(OBJS)\monolib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8570,15 +8599,18 @@ $(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp $(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_progdlg.o: ../../src/msw/progdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_msw_radiobox.o: ../../src/msw/radiobox.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\monolib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8918,6 +8950,9 @@ $(OBJS)\monolib_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp $(OBJS)\monolib_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_collpane.o: ../../src/xrc/xh_collpane.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9047,6 +9082,9 @@ $(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9167,6 +9205,9 @@ $(OBJS)\monolib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp $(OBJS)\monolib_richtextprint.o: ../../src/richtext/richtextprint.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10058,11 +10099,11 @@ $(OBJS)\monolib_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10088,11 +10129,11 @@ $(OBJS)\monolib_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\monolib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10341,7 +10382,7 @@ $(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 $(OBJS)\basedll_any.o: ../../src/common/any.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11010,7 +11051,7 @@ $(OBJS)\netdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET $(OBJS)\netdll_fs_inet.o: ../../src/common/fs_inet.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11091,7 +11132,7 @@ $(OBJS)\coredll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 $(OBJS)\coredll_event.o: ../../src/common/event.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11210,15 +11251,18 @@ $(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp $(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_progdlg.o: ../../src/msw/progdlg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_msw_radiobox.o: ../../src/msw/radiobox.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\coredll_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\coredll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12293,11 +12337,11 @@ $(OBJS)\coredll_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -12323,11 +12367,11 @@ $(OBJS)\coredll_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\coredll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -12517,15 +12561,18 @@ $(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp $(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_progdlg.o: ../../src/msw/progdlg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_msw_radiobox.o: ../../src/msw/radiobox.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\corelib_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - +$(OBJS)\corelib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13600,11 +13647,11 @@ $(OBJS)\corelib_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -13630,11 +13677,11 @@ $(OBJS)\corelib_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) +$(OBJS)\corelib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -13708,7 +13755,7 @@ $(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_ADV + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_ADV $(OBJS)\advdll_bmpcbox.o: ../../src/msw/bmpcbox.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13951,7 +13998,7 @@ $(OBJS)\mediadll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_MEDIA + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_MEDIA $(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< @@ -13984,7 +14031,7 @@ $(OBJS)\htmldll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_HTML + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_HTML $(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14149,7 +14196,7 @@ $(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\qadll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_QA + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_QA $(OBJS)\qadll_debugrpt.o: ../../src/common/debugrpt.cpp $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< @@ -14170,7 +14217,7 @@ $(OBJS)\xmldll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML $(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14191,7 +14238,7 @@ $(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC $(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14226,6 +14273,9 @@ $(OBJS)\xrcdll_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp $(OBJS)\xrcdll_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_collpane.o: ../../src/xrc/xh_collpane.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14355,6 +14405,9 @@ $(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14412,6 +14465,9 @@ $(OBJS)\xrclib_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp $(OBJS)\xrclib_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_collpane.o: ../../src/xrc/xh_collpane.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14541,6 +14597,9 @@ $(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14566,7 +14625,7 @@ $(OBJS)\auidll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\auidll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_AUI + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_AUI $(OBJS)\auidll_framemanager.o: ../../src/aui/framemanager.cpp $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14611,7 +14670,7 @@ $(OBJS)\ribbondll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\ribbondll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RIBBON + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RIBBON $(OBJS)\ribbondll_art_internal.o: ../../src/ribbon/art_internal.cpp $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14680,7 +14739,7 @@ $(OBJS)\propgriddll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\propgriddll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID $(OBJS)\propgriddll_advprops.o: ../../src/propgrid/advprops.cpp $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14737,7 +14796,7 @@ $(OBJS)\richtextdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\richtextdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT $(OBJS)\richtextdll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14766,6 +14825,9 @@ $(OBJS)\richtextdll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp $(OBJS)\richtextdll_richtextprint.o: ../../src/richtext/richtextprint.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\richtextdll_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14796,11 +14858,14 @@ $(OBJS)\richtextlib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp $(OBJS)\richtextlib_richtextprint.o: ../../src/richtext/richtextprint.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\richtextlib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp + $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\stcdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC $(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14827,7 +14892,7 @@ $(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL $(OBJS)\gldll_glcmn.o: ../../src/common/glcmn.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<