From: Vadim Zeitlin Date: Fri, 16 Mar 2007 16:43:44 +0000 (+0000) Subject: regenerated after wxSelectDispatcher addition (patch 1618976) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7b2d175c4724a87ffdd103f14d03fb8d5724f6a8?ds=sidebyside regenerated after wxSelectDispatcher addition (patch 1618976) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 3bdb1efb36..735077e75a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3736,7 +3736,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ @COND_TOOLKIT_COCOA@ monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \ monodll_fontmgrcmn.o \ - monodll_socketevtdispatch.o \ + monodll_gsocketiohandler.o \ + monodll_selectdispatcher.o \ monodll_caret.o \ monodll_colour.o \ monodll_icon.o \ @@ -3916,6 +3917,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_gdiplus.o \ monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ @@ -3969,6 +3971,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_gdiplus.o \ monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ @@ -4001,7 +4004,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_fontutil.o \ monodll_utilsx11.o \ monodll_displayx11.o \ - monodll_socketevtdispatch.o \ + monodll_gsocketiohandler.o \ + monodll_selectdispatcher.o \ monodll_icon.o \ monodll_timer.o \ monodll_app.o \ @@ -4569,7 +4573,8 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_COCOA@ monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontmgrcmn.o \ - monodll_socketevtdispatch.o \ + monodll_gsocketiohandler.o \ + monodll_selectdispatcher.o \ monodll_caret.o \ monodll_colour.o \ monodll_icon.o \ @@ -4749,6 +4754,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_gdiplus.o \ monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ @@ -4802,6 +4808,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_gdiplus.o \ monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ @@ -4834,7 +4841,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontutil.o \ monodll_utilsx11.o \ monodll_displayx11.o \ - monodll_socketevtdispatch.o \ + monodll_gsocketiohandler.o \ + monodll_selectdispatcher.o \ monodll_icon.o \ monodll_timer.o \ monodll_app.o \ @@ -5521,7 +5529,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@ monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontmgrcmn.o \ - monolib_socketevtdispatch.o \ + monolib_gsocketiohandler.o \ + monolib_selectdispatcher.o \ monolib_caret.o \ monolib_colour.o \ monolib_icon.o \ @@ -5702,6 +5711,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_gdiplus.o \ monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ @@ -5755,6 +5765,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_gdiplus.o \ monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ @@ -5787,7 +5798,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontutil.o \ monolib_utilsx11.o \ monolib_displayx11.o \ - monolib_socketevtdispatch.o \ + monolib_gsocketiohandler.o \ + monolib_selectdispatcher.o \ monolib_icon.o \ monolib_timer.o \ monolib_app.o \ @@ -6355,7 +6367,8 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@ monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontmgrcmn.o \ - monolib_socketevtdispatch.o \ + monolib_gsocketiohandler.o \ + monolib_selectdispatcher.o \ monolib_caret.o \ monolib_colour.o \ monolib_icon.o \ @@ -6536,6 +6549,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_gdiplus.o \ monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ @@ -6589,6 +6603,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_gdiplus.o \ monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ @@ -6621,7 +6636,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontutil.o \ monolib_utilsx11.o \ monolib_displayx11.o \ - monolib_socketevtdispatch.o \ + monolib_gsocketiohandler.o \ + monolib_selectdispatcher.o \ monolib_icon.o \ monolib_timer.o \ monolib_app.o \ @@ -7536,7 +7552,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ @COND_TOOLKIT_COCOA@ coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontmgrcmn.o \ - coredll_socketevtdispatch.o \ + coredll_gsocketiohandler.o \ + coredll_selectdispatcher.o \ coredll_caret.o \ coredll_colour.o \ coredll_icon.o \ @@ -7717,6 +7734,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_gdiplus.o \ coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ @@ -7770,6 +7788,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_gdiplus.o \ coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ @@ -7802,7 +7821,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontutil.o \ coredll_utilsx11.o \ coredll_displayx11.o \ - coredll_socketevtdispatch.o \ + coredll_gsocketiohandler.o \ + coredll_selectdispatcher.o \ coredll_icon.o \ coredll_timer.o \ coredll_app.o \ @@ -8370,7 +8390,8 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_COCOA@ coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontmgrcmn.o \ - coredll_socketevtdispatch.o \ + coredll_gsocketiohandler.o \ + coredll_selectdispatcher.o \ coredll_caret.o \ coredll_colour.o \ coredll_icon.o \ @@ -8551,6 +8572,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_gdiplus.o \ coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ @@ -8604,6 +8626,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_gdiplus.o \ coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ @@ -8636,7 +8659,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontutil.o \ coredll_utilsx11.o \ coredll_displayx11.o \ - coredll_socketevtdispatch.o \ + coredll_gsocketiohandler.o \ + coredll_selectdispatcher.o \ coredll_icon.o \ coredll_timer.o \ coredll_app.o \ @@ -8993,7 +9017,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ @COND_TOOLKIT_COCOA@ corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontmgrcmn.o \ - corelib_socketevtdispatch.o \ + corelib_gsocketiohandler.o \ + corelib_selectdispatcher.o \ corelib_caret.o \ corelib_colour.o \ corelib_icon.o \ @@ -9174,6 +9199,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_gdiplus.o \ corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ @@ -9227,6 +9253,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_gdiplus.o \ corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ @@ -9259,7 +9286,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontutil.o \ corelib_utilsx11.o \ corelib_displayx11.o \ - corelib_socketevtdispatch.o \ + corelib_gsocketiohandler.o \ + corelib_selectdispatcher.o \ corelib_icon.o \ corelib_timer.o \ corelib_app.o \ @@ -9827,7 +9855,8 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_COCOA@ corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontmgrcmn.o \ - corelib_socketevtdispatch.o \ + corelib_gsocketiohandler.o \ + corelib_selectdispatcher.o \ corelib_caret.o \ corelib_colour.o \ corelib_icon.o \ @@ -10008,6 +10037,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_gdiplus.o \ corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ @@ -10061,6 +10091,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_gdiplus.o \ corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ @@ -10093,7 +10124,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontutil.o \ corelib_utilsx11.o \ corelib_displayx11.o \ - corelib_socketevtdispatch.o \ + corelib_gsocketiohandler.o \ + corelib_selectdispatcher.o \ corelib_icon.o \ corelib_timer.o \ corelib_app.o \ @@ -14747,6 +14779,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp @@ -14864,11 +14902,17 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp -@COND_TOOLKIT_X11_USE_GUI_1@monodll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_TOOLKIT_DFB_USE_GUI_1@monodll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_DFB_USE_GUI_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/x11/nanox.c @@ -18875,6 +18919,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp @@ -18992,11 +19042,17 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp -@COND_TOOLKIT_X11_USE_GUI_1@monolib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_TOOLKIT_DFB_USE_GUI_1@monolib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_DFB_USE_GUI_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c @@ -23384,6 +23440,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp @@ -23501,11 +23563,17 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp -@COND_TOOLKIT_X11_USE_GUI_1@coredll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@coredll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@coredll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_TOOLKIT_DFB_USE_GUI_1@coredll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_DFB_USE_GUI_1@coredll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c @@ -26342,6 +26410,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp @@ -26459,11 +26533,17 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp -@COND_TOOLKIT_X11_USE_GUI_1@corelib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@corelib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@corelib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_TOOLKIT_DFB_USE_GUI_1@corelib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp +@COND_TOOLKIT_DFB_USE_GUI_1@corelib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 9300746015..c3126ef4e0 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1339,6 +1339,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ @@ -1562,6 +1563,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ @@ -1959,6 +1961,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ @@ -2182,6 +2185,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ @@ -2487,6 +2491,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ @@ -2710,6 +2715,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ @@ -2940,6 +2946,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ @@ -3163,6 +3170,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ @@ -5426,6 +5434,11 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7433,6 +7446,11 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -9464,6 +9482,11 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10744,6 +10767,11 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 78e77c21de..afef209ad8 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1349,6 +1349,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.o \ $(OBJS)\monodll_gdiimage.o \ $(OBJS)\monodll_gdiobj.o \ + $(OBJS)\monodll_gdiplus.o \ $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_gsockmsw.o \ $(OBJS)\monodll_icon.o \ @@ -1574,6 +1575,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.o \ $(OBJS)\monodll_gdiimage.o \ $(OBJS)\monodll_gdiobj.o \ + $(OBJS)\monodll_gdiplus.o \ $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_gsockmsw.o \ $(OBJS)\monodll_icon.o \ @@ -1975,6 +1977,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.o \ $(OBJS)\monolib_gdiimage.o \ $(OBJS)\monolib_gdiobj.o \ + $(OBJS)\monolib_gdiplus.o \ $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_gsockmsw.o \ $(OBJS)\monolib_icon.o \ @@ -2200,6 +2203,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.o \ $(OBJS)\monolib_gdiimage.o \ $(OBJS)\monolib_gdiobj.o \ + $(OBJS)\monolib_gdiplus.o \ $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_gsockmsw.o \ $(OBJS)\monolib_icon.o \ @@ -2519,6 +2523,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.o \ $(OBJS)\coredll_gdiimage.o \ $(OBJS)\coredll_gdiobj.o \ + $(OBJS)\coredll_gdiplus.o \ $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_gsockmsw.o \ $(OBJS)\coredll_icon.o \ @@ -2744,6 +2749,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.o \ $(OBJS)\coredll_gdiimage.o \ $(OBJS)\coredll_gdiobj.o \ + $(OBJS)\coredll_gdiplus.o \ $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_gsockmsw.o \ $(OBJS)\coredll_icon.o \ @@ -2980,6 +2986,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.o \ $(OBJS)\corelib_gdiimage.o \ $(OBJS)\corelib_gdiobj.o \ + $(OBJS)\corelib_gdiplus.o \ $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_gsockmsw.o \ $(OBJS)\corelib_icon.o \ @@ -3205,6 +3212,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.o \ $(OBJS)\corelib_gdiimage.o \ $(OBJS)\corelib_gdiobj.o \ + $(OBJS)\corelib_gdiplus.o \ $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_gsockmsw.o \ $(OBJS)\corelib_icon.o \ @@ -5555,6 +5563,11 @@ $(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_gdiplus.o: ../../src/msw/gdiplus.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_graphics.o: ../../src/msw/graphics.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7662,6 +7675,11 @@ $(OBJS)\monolib_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gdiplus.o: ../../src/msw/gdiplus.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_graphics.o: ../../src/msw/graphics.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9793,6 +9811,11 @@ $(OBJS)\coredll_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_gdiplus.o: ../../src/msw/gdiplus.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_graphics.o: ../../src/msw/graphics.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11173,6 +11196,11 @@ $(OBJS)\corelib_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_gdiplus.o: ../../src/msw/gdiplus.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_graphics.o: ../../src/msw/graphics.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 2902119ae4..095125ec59 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1506,6 +1506,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ @@ -1729,6 +1730,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ @@ -2132,6 +2134,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ @@ -2355,6 +2358,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ @@ -2690,6 +2694,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ @@ -2913,6 +2918,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ @@ -3149,6 +3155,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ @@ -3372,6 +3379,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ @@ -5759,6 +5767,11 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7766,6 +7779,11 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -9797,6 +9815,11 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -11077,6 +11100,11 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 3d0d4f2543..0ff9b962a2 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -231,6 +231,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_fontutil.obj & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & + $(OBJS)\monodll_gdiplus.obj & $(OBJS)\monodll_graphics.obj & $(OBJS)\monodll_gsockmsw.obj & $(OBJS)\monodll_icon.obj & @@ -456,6 +457,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_fontutil.obj & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & + $(OBJS)\monodll_gdiplus.obj & $(OBJS)\monodll_graphics.obj & $(OBJS)\monodll_gsockmsw.obj & $(OBJS)\monodll_icon.obj & @@ -861,6 +863,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_fontutil.obj & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & + $(OBJS)\monolib_gdiplus.obj & $(OBJS)\monolib_graphics.obj & $(OBJS)\monolib_gsockmsw.obj & $(OBJS)\monolib_icon.obj & @@ -1086,6 +1089,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_fontutil.obj & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & + $(OBJS)\monolib_gdiplus.obj & $(OBJS)\monolib_graphics.obj & $(OBJS)\monolib_gsockmsw.obj & $(OBJS)\monolib_icon.obj & @@ -1412,6 +1416,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_fontutil.obj & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & + $(OBJS)\coredll_gdiplus.obj & $(OBJS)\coredll_graphics.obj & $(OBJS)\coredll_gsockmsw.obj & $(OBJS)\coredll_icon.obj & @@ -1637,6 +1642,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_fontutil.obj & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & + $(OBJS)\coredll_gdiplus.obj & $(OBJS)\coredll_graphics.obj & $(OBJS)\coredll_gsockmsw.obj & $(OBJS)\coredll_icon.obj & @@ -1875,6 +1881,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_fontutil.obj & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & + $(OBJS)\corelib_gdiplus.obj & $(OBJS)\corelib_graphics.obj & $(OBJS)\corelib_gsockmsw.obj & $(OBJS)\corelib_icon.obj & @@ -2100,6 +2107,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_fontutil.obj & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & + $(OBJS)\corelib_gdiplus.obj & $(OBJS)\corelib_graphics.obj & $(OBJS)\corelib_gsockmsw.obj & $(OBJS)\corelib_icon.obj & @@ -5785,6 +5793,11 @@ $(OBJS)\monodll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7892,6 +7905,11 @@ $(OBJS)\monolib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10023,6 +10041,11 @@ $(OBJS)\coredll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -11403,6 +11426,11 @@ $(OBJS)\corelib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 5f7a2e70c8..6de40e0215 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -2147,6 +2147,10 @@ SOURCE=..\..\src\msw\gdiobj.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\gdiplus.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\graphics.cpp # End Source File # Begin Source File