Compile wxAppProgressIndicator as part of wxUniv/MSW too
This fixes link problem due to using wxAppProgressIndicator from the
common wxGauge code, see 11a5b83e2c (Add OS X implementation of
wxAppProgressIndicator., 2015-02-15) and seems to be better than adding
checks for wxUniv there, as this is part of "platform" functionality
rather than "toolkit".
This also pulls in wxTaskBarButton code.
This commit is contained in:
Vadim Zeitlin
parent
0b5252d12f
commit
0d046b8e9e
6 changed files with 171 additions and 115 deletions
|
|
@ -2273,6 +2273,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_msw_bmpbndl.obj \
|
||||
$(OBJS)\monodll_overlay.obj \
|
||||
$(OBJS)\monodll_darkmode.obj \
|
||||
$(OBJS)\monodll_appprogress.obj \
|
||||
$(OBJS)\monodll_taskbarbutton.obj \
|
||||
$(OBJS)\monodll_clrpickerg.obj \
|
||||
$(OBJS)\monodll_collpaneg.obj \
|
||||
$(OBJS)\monodll_filepickerg.obj \
|
||||
|
|
@ -2281,7 +2283,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_prntdlgg.obj \
|
||||
$(OBJS)\monodll_msw_accel.obj \
|
||||
$(OBJS)\monodll_msw_anybutton.obj \
|
||||
$(OBJS)\monodll_appprogress.obj \
|
||||
$(OBJS)\monodll_artmsw.obj \
|
||||
$(OBJS)\monodll_msw_bmpbuttn.obj \
|
||||
$(OBJS)\monodll_msw_button.obj \
|
||||
|
|
@ -2323,7 +2324,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_statusbar.obj \
|
||||
$(OBJS)\monodll_msw_statline.obj \
|
||||
$(OBJS)\monodll_msw_stattext.obj \
|
||||
$(OBJS)\monodll_taskbarbutton.obj \
|
||||
$(OBJS)\monodll_msw_toolbar.obj \
|
||||
$(OBJS)\monodll_msw_textctrl.obj \
|
||||
$(OBJS)\monodll_textentry.obj \
|
||||
|
|
@ -2619,6 +2619,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_msw_bmpbndl.obj \
|
||||
$(OBJS)\monodll_overlay.obj \
|
||||
$(OBJS)\monodll_darkmode.obj \
|
||||
$(OBJS)\monodll_appprogress.obj \
|
||||
$(OBJS)\monodll_taskbarbutton.obj \
|
||||
$(OBJS)\monodll_generic_accel.obj \
|
||||
$(OBJS)\monodll_clrpickerg.obj \
|
||||
$(OBJS)\monodll_collpaneg.obj \
|
||||
|
|
@ -3126,6 +3128,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_msw_bmpbndl.obj \
|
||||
$(OBJS)\monolib_overlay.obj \
|
||||
$(OBJS)\monolib_darkmode.obj \
|
||||
$(OBJS)\monolib_appprogress.obj \
|
||||
$(OBJS)\monolib_taskbarbutton.obj \
|
||||
$(OBJS)\monolib_clrpickerg.obj \
|
||||
$(OBJS)\monolib_collpaneg.obj \
|
||||
$(OBJS)\monolib_filepickerg.obj \
|
||||
|
|
@ -3134,7 +3138,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_prntdlgg.obj \
|
||||
$(OBJS)\monolib_msw_accel.obj \
|
||||
$(OBJS)\monolib_msw_anybutton.obj \
|
||||
$(OBJS)\monolib_appprogress.obj \
|
||||
$(OBJS)\monolib_artmsw.obj \
|
||||
$(OBJS)\monolib_msw_bmpbuttn.obj \
|
||||
$(OBJS)\monolib_msw_button.obj \
|
||||
|
|
@ -3176,7 +3179,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_statusbar.obj \
|
||||
$(OBJS)\monolib_msw_statline.obj \
|
||||
$(OBJS)\monolib_msw_stattext.obj \
|
||||
$(OBJS)\monolib_taskbarbutton.obj \
|
||||
$(OBJS)\monolib_msw_toolbar.obj \
|
||||
$(OBJS)\monolib_msw_textctrl.obj \
|
||||
$(OBJS)\monolib_textentry.obj \
|
||||
|
|
@ -3472,6 +3474,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_msw_bmpbndl.obj \
|
||||
$(OBJS)\monolib_overlay.obj \
|
||||
$(OBJS)\monolib_darkmode.obj \
|
||||
$(OBJS)\monolib_appprogress.obj \
|
||||
$(OBJS)\monolib_taskbarbutton.obj \
|
||||
$(OBJS)\monolib_generic_accel.obj \
|
||||
$(OBJS)\monolib_clrpickerg.obj \
|
||||
$(OBJS)\monolib_collpaneg.obj \
|
||||
|
|
@ -3908,6 +3912,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_msw_bmpbndl.obj \
|
||||
$(OBJS)\coredll_overlay.obj \
|
||||
$(OBJS)\coredll_darkmode.obj \
|
||||
$(OBJS)\coredll_appprogress.obj \
|
||||
$(OBJS)\coredll_taskbarbutton.obj \
|
||||
$(OBJS)\coredll_clrpickerg.obj \
|
||||
$(OBJS)\coredll_collpaneg.obj \
|
||||
$(OBJS)\coredll_filepickerg.obj \
|
||||
|
|
@ -3916,7 +3922,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_prntdlgg.obj \
|
||||
$(OBJS)\coredll_msw_accel.obj \
|
||||
$(OBJS)\coredll_msw_anybutton.obj \
|
||||
$(OBJS)\coredll_appprogress.obj \
|
||||
$(OBJS)\coredll_artmsw.obj \
|
||||
$(OBJS)\coredll_msw_bmpbuttn.obj \
|
||||
$(OBJS)\coredll_msw_button.obj \
|
||||
|
|
@ -3958,7 +3963,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_statusbar.obj \
|
||||
$(OBJS)\coredll_msw_statline.obj \
|
||||
$(OBJS)\coredll_msw_stattext.obj \
|
||||
$(OBJS)\coredll_taskbarbutton.obj \
|
||||
$(OBJS)\coredll_msw_toolbar.obj \
|
||||
$(OBJS)\coredll_msw_textctrl.obj \
|
||||
$(OBJS)\coredll_textentry.obj \
|
||||
|
|
@ -4254,6 +4258,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_msw_bmpbndl.obj \
|
||||
$(OBJS)\coredll_overlay.obj \
|
||||
$(OBJS)\coredll_darkmode.obj \
|
||||
$(OBJS)\coredll_appprogress.obj \
|
||||
$(OBJS)\coredll_taskbarbutton.obj \
|
||||
$(OBJS)\coredll_generic_accel.obj \
|
||||
$(OBJS)\coredll_clrpickerg.obj \
|
||||
$(OBJS)\coredll_collpaneg.obj \
|
||||
|
|
@ -4595,6 +4601,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_msw_bmpbndl.obj \
|
||||
$(OBJS)\corelib_overlay.obj \
|
||||
$(OBJS)\corelib_darkmode.obj \
|
||||
$(OBJS)\corelib_appprogress.obj \
|
||||
$(OBJS)\corelib_taskbarbutton.obj \
|
||||
$(OBJS)\corelib_clrpickerg.obj \
|
||||
$(OBJS)\corelib_collpaneg.obj \
|
||||
$(OBJS)\corelib_filepickerg.obj \
|
||||
|
|
@ -4603,7 +4611,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_prntdlgg.obj \
|
||||
$(OBJS)\corelib_msw_accel.obj \
|
||||
$(OBJS)\corelib_msw_anybutton.obj \
|
||||
$(OBJS)\corelib_appprogress.obj \
|
||||
$(OBJS)\corelib_artmsw.obj \
|
||||
$(OBJS)\corelib_msw_bmpbuttn.obj \
|
||||
$(OBJS)\corelib_msw_button.obj \
|
||||
|
|
@ -4645,7 +4652,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_statusbar.obj \
|
||||
$(OBJS)\corelib_msw_statline.obj \
|
||||
$(OBJS)\corelib_msw_stattext.obj \
|
||||
$(OBJS)\corelib_taskbarbutton.obj \
|
||||
$(OBJS)\corelib_msw_toolbar.obj \
|
||||
$(OBJS)\corelib_msw_textctrl.obj \
|
||||
$(OBJS)\corelib_textentry.obj \
|
||||
|
|
@ -4941,6 +4947,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_msw_bmpbndl.obj \
|
||||
$(OBJS)\corelib_overlay.obj \
|
||||
$(OBJS)\corelib_darkmode.obj \
|
||||
$(OBJS)\corelib_appprogress.obj \
|
||||
$(OBJS)\corelib_taskbarbutton.obj \
|
||||
$(OBJS)\corelib_generic_accel.obj \
|
||||
$(OBJS)\corelib_clrpickerg.obj \
|
||||
$(OBJS)\corelib_collpaneg.obj \
|
||||
|
|
@ -7826,9 +7834,6 @@ $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
|
|||
$(OBJS)\monodll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
|
||||
|
||||
$(OBJS)\monodll_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
|
||||
$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
|
||||
|
||||
|
|
@ -7952,9 +7957,6 @@ $(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp
|
|||
$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
|
||||
|
||||
$(OBJS)\monodll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
|
||||
$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
|
||||
|
||||
|
|
@ -8963,6 +8965,16 @@ $(OBJS)\monodll_darkmode.obj: ..\..\src\msw\darkmode.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\darkmode.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
|
||||
|
|
@ -10415,9 +10427,6 @@ $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
|
|||
$(OBJS)\monolib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
|
||||
|
||||
$(OBJS)\monolib_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
|
||||
$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
|
||||
|
||||
|
|
@ -10541,9 +10550,6 @@ $(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp
|
|||
$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
|
||||
|
||||
$(OBJS)\monolib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
|
||||
$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
|
||||
|
||||
|
|
@ -11552,6 +11558,16 @@ $(OBJS)\monolib_darkmode.obj: ..\..\src\msw\darkmode.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\darkmode.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
|
||||
|
|
@ -13427,9 +13443,6 @@ $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
|
|||
$(OBJS)\coredll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
|
||||
|
||||
$(OBJS)\coredll_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
|
||||
$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
|
||||
|
||||
|
|
@ -13553,9 +13566,6 @@ $(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp
|
|||
$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
|
||||
|
||||
$(OBJS)\coredll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
|
||||
$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
|
||||
|
||||
|
|
@ -14102,6 +14112,16 @@ $(OBJS)\coredll_darkmode.obj: ..\..\src\msw\darkmode.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\darkmode.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
|
||||
|
|
@ -15182,9 +15202,6 @@ $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp
|
|||
$(OBJS)\corelib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
|
||||
|
||||
$(OBJS)\corelib_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
|
||||
$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
|
||||
|
||||
|
|
@ -15308,9 +15325,6 @@ $(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp
|
|||
$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
|
||||
|
||||
$(OBJS)\corelib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
|
||||
$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
|
||||
|
||||
|
|
@ -15857,6 +15871,16 @@ $(OBJS)\corelib_darkmode.obj: ..\..\src\msw\darkmode.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\darkmode.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_appprogress.obj: ..\..\src\msw\appprogress.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue