Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):

Browse Source 
1. Changed wxTimer to use wxTimerImpl
2. Added Unix-specific generic timer implementation
3. Added wxAppTraits::CreateTimerImpl()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-20 01:29:16 +00:00
parent a9c9588480
commit c2ca375c56
62 changed files with 1554 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/bakefiles/files.bkl
View File

@@ -62,6 +62,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/unix/stackwalk.cpp
src/unix/stdpaths.cpp
src/unix/threadpsx.cpp
src/unix/timerunx.cpp
</set>
<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
src/unix/utilsunx.cpp
@@ -95,6 +96,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/stackwalk.cpp
src/msw/stdpaths.cpp
src/msw/thread.cpp
src/msw/timer.cpp
src/msw/utils.cpp
src/msw/utilsexc.cpp
</set>
@@ -201,6 +203,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/unix/dlunix.cpp
src/unix/snglinst.cpp
src/unix/stdpaths.cpp
src/unix/timerunx.cpp
</set>
<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
$(BASE_MAC_HDR)
@@ -348,6 +351,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/tarstrm.cpp
src/common/textbuf.cpp
src/common/textfile.cpp
src/common/timercmn.cpp
src/common/timerimpl.cpp
src/common/tokenzr.cpp
src/common/txtstrm.cpp
src/common/unichar.cpp
@@ -661,7 +666,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/stockitem.cpp
src/common/tbarbase.cpp
src/common/textcmn.cpp
src/common/timercmn.cpp
src/common/toplvcmn.cpp
src/common/treebase.cpp
src/common/valgen.cpp
@@ -759,7 +763,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/splitter.h
wx/generic/srchctlg.h
wx/generic/textdlgg.h
wx/generic/timer.h
wx/generic/treectlg.h
wx/graphics.h
wx/helphtml.h
@@ -983,7 +986,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/pen.h
wx/gtk/popupwin.h
wx/gtk/region.h
wx/gtk/timer.h
wx/gtk/tooltip.h
wx/gtk/toplevel.h
wx/gtk/win_gtk.h
@@ -1162,7 +1164,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk1/pen.h
wx/gtk1/popupwin.h
wx/gtk1/region.h
wx/gtk1/timer.h
wx/gtk1/tooltip.h
wx/gtk1/toplevel.h
wx/gtk1/win_gtk.h
@@ -1404,7 +1405,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/motif/stattext.h
wx/motif/textctrl.h
wx/motif/tglbtn.h
wx/motif/timer.h
wx/motif/toolbar.h
wx/motif/toplevel.h
wx/motif/window.h
@@ -1531,7 +1531,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/region.cpp
src/msw/renderer.cpp
src/msw/settings.cpp
src/msw/timer.cpp
src/msw/tooltip.cpp
src/msw/toplevel.cpp
src/msw/utilsgui.cpp
@@ -1683,7 +1682,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/tbar95.h
wx/msw/textctrl.h
wx/msw/tglbtn.h
wx/msw/timer.h
wx/msw/tooltip.h
wx/msw/toplevel.h
wx/msw/treectrl.h
@@ -1811,7 +1809,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/icon.h
wx/generic/imaglist.h
wx/generic/mask.h
wx/generic/timer.h
wx/mgl/app.h
wx/mgl/bitmap.h
wx/mgl/brush.h
@@ -1876,7 +1873,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/icon.h
wx/generic/imaglist.h
wx/generic/mask.h
wx/generic/timer.h
wx/dfb/app.h
wx/dfb/bitmap.h
wx/dfb/brush.h
@@ -2061,7 +2057,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/os2/tabctrl.h
wx/os2/textctrl.h
wx/os2/tglbtn.h
wx/os2/timer.h
wx/os2/toolbar.h
wx/os2/tooltip.h
wx/os2/toplevel.h
@@ -2267,7 +2262,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/mac/tabctrl.h
wx/mac/taskbarosx.h
wx/mac/textctrl.h
wx/mac/timer.h
wx/mac/tglbtn.h
wx/mac/toolbar.h
wx/mac/tooltip.h
@@ -2353,7 +2347,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/mac/carbon/statusbr.h
wx/mac/carbon/tabctrl.h
wx/mac/carbon/textctrl.h
wx/mac/carbon/timer.h
wx/mac/carbon/tglbtn.h
wx/mac/carbon/toolbar.h
wx/mac/carbon/tooltip.h
@@ -2541,7 +2534,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/cocoa/statline.h
wx/cocoa/stattext.h
wx/cocoa/textctrl.h
wx/cocoa/timer.h
wx/cocoa/toolbar.h
wx/cocoa/tooltip.h
wx/cocoa/toplevel.h

104
build/msw/makefile.bcc
View File

@@ -352,6 +352,8 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_tarstrm.obj \
$(OBJS)\monodll_textbuf.obj \
$(OBJS)\monodll_textfile.obj \
$(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_timerimpl.obj \
$(OBJS)\monodll_tokenzr.obj \
$(OBJS)\monodll_txtstrm.obj \
$(OBJS)\monodll_unichar.obj \
@@ -378,6 +380,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_stackwalk.obj \
$(OBJS)\monodll_stdpaths.obj \
$(OBJS)\monodll_thread.obj \
$(OBJS)\monodll_timer.obj \
$(OBJS)\monodll_utils.obj \
$(OBJS)\monodll_utilsexc.obj \
$(OBJS)\monodll_event.obj \
@@ -481,6 +484,8 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_tarstrm.obj \
$(OBJS)\monolib_textbuf.obj \
$(OBJS)\monolib_textfile.obj \
$(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_timerimpl.obj \
$(OBJS)\monolib_tokenzr.obj \
$(OBJS)\monolib_txtstrm.obj \
$(OBJS)\monolib_unichar.obj \
@@ -507,6 +512,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_stackwalk.obj \
$(OBJS)\monolib_stdpaths.obj \
$(OBJS)\monolib_thread.obj \
$(OBJS)\monolib_timer.obj \
$(OBJS)\monolib_utils.obj \
$(OBJS)\monolib_utilsexc.obj \
$(OBJS)\monolib_event.obj \
@@ -608,6 +614,8 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_tarstrm.obj \
$(OBJS)\basedll_textbuf.obj \
$(OBJS)\basedll_textfile.obj \
$(OBJS)\basedll_timercmn.obj \
$(OBJS)\basedll_timerimpl.obj \
$(OBJS)\basedll_tokenzr.obj \
$(OBJS)\basedll_txtstrm.obj \
$(OBJS)\basedll_unichar.obj \
@@ -634,6 +642,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_stackwalk.obj \
$(OBJS)\basedll_stdpaths.obj \
$(OBJS)\basedll_thread.obj \
$(OBJS)\basedll_timer.obj \
$(OBJS)\basedll_utils.obj \
$(OBJS)\basedll_utilsexc.obj \
$(OBJS)\basedll_event.obj \
@@ -719,6 +728,8 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_tarstrm.obj \
$(OBJS)\baselib_textbuf.obj \
$(OBJS)\baselib_textfile.obj \
$(OBJS)\baselib_timercmn.obj \
$(OBJS)\baselib_timerimpl.obj \
$(OBJS)\baselib_tokenzr.obj \
$(OBJS)\baselib_txtstrm.obj \
$(OBJS)\baselib_unichar.obj \
@@ -745,6 +756,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_stackwalk.obj \
$(OBJS)\baselib_stdpaths.obj \
$(OBJS)\baselib_thread.obj \
$(OBJS)\baselib_timer.obj \
$(OBJS)\baselib_utils.obj \
$(OBJS)\baselib_utilsexc.obj \
$(OBJS)\baselib_event.obj \
@@ -1512,7 +1524,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_timer.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_utilsgui.obj \
@@ -1656,7 +1667,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_valgen.obj \
@@ -1739,7 +1749,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_timer.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_utilsgui.obj \
@@ -1886,7 +1895,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_valgen.obj \
@@ -2143,7 +2151,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_timer.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_utilsgui.obj \
@@ -2287,7 +2294,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_valgen.obj \
@@ -2370,7 +2376,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_timer.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_utilsgui.obj \
@@ -2517,7 +2522,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_valgen.obj \
@@ -2691,7 +2695,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_timer.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_utilsgui.obj \
@@ -2835,7 +2838,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_valgen.obj \
@@ -2918,7 +2920,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_timer.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_utilsgui.obj \
@@ -3065,7 +3066,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_valgen.obj \
@@ -3152,7 +3152,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_timer.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_utilsgui.obj \
@@ -3296,7 +3295,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_valgen.obj \
@@ -3379,7 +3377,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_timer.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_utilsgui.obj \
@@ -3526,7 +3523,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_valgen.obj \
@@ -5340,6 +5336,12 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5418,6 +5420,9 @@ $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6154,11 +6159,6 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6889,11 +6889,6 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7397,6 +7392,12 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7475,6 +7476,9 @@ $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8211,11 +8215,6 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8946,11 +8945,6 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -9454,6 +9448,12 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
@@ -9532,6 +9532,9 @@ $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
@@ -9739,6 +9742,12 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
@@ -9817,6 +9826,9 @@ $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
@@ -10298,11 +10310,6 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -11033,11 +11040,6 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -11598,11 +11600,6 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -12333,11 +12330,6 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

104
build/msw/makefile.gcc
View File

@@ -336,6 +336,8 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_tarstrm.o \
$(OBJS)\monodll_textbuf.o \
$(OBJS)\monodll_textfile.o \
$(OBJS)\monodll_timercmn.o \
$(OBJS)\monodll_timerimpl.o \
$(OBJS)\monodll_tokenzr.o \
$(OBJS)\monodll_txtstrm.o \
$(OBJS)\monodll_unichar.o \
@@ -362,6 +364,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_stackwalk.o \
$(OBJS)\monodll_stdpaths.o \
$(OBJS)\monodll_thread.o \
$(OBJS)\monodll_timer.o \
$(OBJS)\monodll_utils.o \
$(OBJS)\monodll_utilsexc.o \
$(OBJS)\monodll_event.o \
@@ -467,6 +470,8 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_tarstrm.o \
$(OBJS)\monolib_textbuf.o \
$(OBJS)\monolib_textfile.o \
$(OBJS)\monolib_timercmn.o \
$(OBJS)\monolib_timerimpl.o \
$(OBJS)\monolib_tokenzr.o \
$(OBJS)\monolib_txtstrm.o \
$(OBJS)\monolib_unichar.o \
@@ -493,6 +498,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_stackwalk.o \
$(OBJS)\monolib_stdpaths.o \
$(OBJS)\monolib_thread.o \
$(OBJS)\monolib_timer.o \
$(OBJS)\monolib_utils.o \
$(OBJS)\monolib_utilsexc.o \
$(OBJS)\monolib_event.o \
@@ -595,6 +601,8 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_tarstrm.o \
$(OBJS)\basedll_textbuf.o \
$(OBJS)\basedll_textfile.o \
$(OBJS)\basedll_timercmn.o \
$(OBJS)\basedll_timerimpl.o \
$(OBJS)\basedll_tokenzr.o \
$(OBJS)\basedll_txtstrm.o \
$(OBJS)\basedll_unichar.o \
@@ -621,6 +629,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_stackwalk.o \
$(OBJS)\basedll_stdpaths.o \
$(OBJS)\basedll_thread.o \
$(OBJS)\basedll_timer.o \
$(OBJS)\basedll_utils.o \
$(OBJS)\basedll_utilsexc.o \
$(OBJS)\basedll_event.o \
@@ -706,6 +715,8 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_tarstrm.o \
$(OBJS)\baselib_textbuf.o \
$(OBJS)\baselib_textfile.o \
$(OBJS)\baselib_timercmn.o \
$(OBJS)\baselib_timerimpl.o \
$(OBJS)\baselib_tokenzr.o \
$(OBJS)\baselib_txtstrm.o \
$(OBJS)\baselib_unichar.o \
@@ -732,6 +743,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_stackwalk.o \
$(OBJS)\baselib_stdpaths.o \
$(OBJS)\baselib_thread.o \
$(OBJS)\baselib_timer.o \
$(OBJS)\baselib_utils.o \
$(OBJS)\baselib_utilsexc.o \
$(OBJS)\baselib_event.o \
@@ -1522,7 +1534,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.o \
$(OBJS)\monodll_renderer.o \
$(OBJS)\monodll_settings.o \
$(OBJS)\monodll_timer.o \
$(OBJS)\monodll_tooltip.o \
$(OBJS)\monodll_toplevel.o \
$(OBJS)\monodll_utilsgui.o \
@@ -1666,7 +1677,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.o \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
$(OBJS)\monodll_timercmn.o \
$(OBJS)\monodll_toplvcmn.o \
$(OBJS)\monodll_treebase.o \
$(OBJS)\monodll_valgen.o \
@@ -1751,7 +1761,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.o \
$(OBJS)\monodll_renderer.o \
$(OBJS)\monodll_settings.o \
$(OBJS)\monodll_timer.o \
$(OBJS)\monodll_tooltip.o \
$(OBJS)\monodll_toplevel.o \
$(OBJS)\monodll_utilsgui.o \
@@ -1898,7 +1907,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.o \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
$(OBJS)\monodll_timercmn.o \
$(OBJS)\monodll_toplvcmn.o \
$(OBJS)\monodll_treebase.o \
$(OBJS)\monodll_valgen.o \
@@ -2159,7 +2167,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.o \
$(OBJS)\monolib_renderer.o \
$(OBJS)\monolib_settings.o \
$(OBJS)\monolib_timer.o \
$(OBJS)\monolib_tooltip.o \
$(OBJS)\monolib_toplevel.o \
$(OBJS)\monolib_utilsgui.o \
@@ -2303,7 +2310,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.o \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
$(OBJS)\monolib_timercmn.o \
$(OBJS)\monolib_toplvcmn.o \
$(OBJS)\monolib_treebase.o \
$(OBJS)\monolib_valgen.o \
@@ -2388,7 +2394,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.o \
$(OBJS)\monolib_renderer.o \
$(OBJS)\monolib_settings.o \
$(OBJS)\monolib_timer.o \
$(OBJS)\monolib_tooltip.o \
$(OBJS)\monolib_toplevel.o \
$(OBJS)\monolib_utilsgui.o \
@@ -2535,7 +2540,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.o \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
$(OBJS)\monolib_timercmn.o \
$(OBJS)\monolib_toplvcmn.o \
$(OBJS)\monolib_treebase.o \
$(OBJS)\monolib_valgen.o \
@@ -2723,7 +2727,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.o \
$(OBJS)\coredll_renderer.o \
$(OBJS)\coredll_settings.o \
$(OBJS)\coredll_timer.o \
$(OBJS)\coredll_tooltip.o \
$(OBJS)\coredll_toplevel.o \
$(OBJS)\coredll_utilsgui.o \
@@ -2867,7 +2870,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.o \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
$(OBJS)\coredll_timercmn.o \
$(OBJS)\coredll_toplvcmn.o \
$(OBJS)\coredll_treebase.o \
$(OBJS)\coredll_valgen.o \
@@ -2952,7 +2954,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.o \
$(OBJS)\coredll_renderer.o \
$(OBJS)\coredll_settings.o \
$(OBJS)\coredll_timer.o \
$(OBJS)\coredll_tooltip.o \
$(OBJS)\coredll_toplevel.o \
$(OBJS)\coredll_utilsgui.o \
@@ -3099,7 +3100,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.o \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
$(OBJS)\coredll_timercmn.o \
$(OBJS)\coredll_toplvcmn.o \
$(OBJS)\coredll_treebase.o \
$(OBJS)\coredll_valgen.o \
@@ -3192,7 +3192,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.o \
$(OBJS)\corelib_renderer.o \
$(OBJS)\corelib_settings.o \
$(OBJS)\corelib_timer.o \
$(OBJS)\corelib_tooltip.o \
$(OBJS)\corelib_toplevel.o \
$(OBJS)\corelib_utilsgui.o \
@@ -3336,7 +3335,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.o \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
$(OBJS)\corelib_timercmn.o \
$(OBJS)\corelib_toplvcmn.o \
$(OBJS)\corelib_treebase.o \
$(OBJS)\corelib_valgen.o \
@@ -3421,7 +3419,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.o \
$(OBJS)\corelib_renderer.o \
$(OBJS)\corelib_settings.o \
$(OBJS)\corelib_timer.o \
$(OBJS)\corelib_tooltip.o \
$(OBJS)\corelib_toplevel.o \
$(OBJS)\corelib_utilsgui.o \
@@ -3568,7 +3565,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.o \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
$(OBJS)\corelib_timercmn.o \
$(OBJS)\corelib_toplvcmn.o \
$(OBJS)\corelib_treebase.o \
$(OBJS)\corelib_valgen.o \
@@ -5501,6 +5497,12 @@ $(OBJS)\monodll_textbuf.o: ../../src/common/textbuf.cpp
$(OBJS)\monodll_textfile.o: ../../src/common/textfile.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_timerimpl.o: ../../src/common/timerimpl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_tokenzr.o: ../../src/common/tokenzr.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5579,6 +5581,9 @@ $(OBJS)\monodll_stdpaths.o: ../../src/msw/stdpaths.cpp
$(OBJS)\monodll_thread.o: ../../src/msw/thread.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_utils.o: ../../src/msw/utils.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6315,11 +6320,6 @@ $(OBJS)\monodll_settings.o: ../../src/msw/settings.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_tooltip.o: ../../src/msw/tooltip.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7150,11 +7150,6 @@ $(OBJS)\monodll_textcmn.o: ../../src/common/textcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_toplvcmn.o: ../../src/common/toplvcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7658,6 +7653,12 @@ $(OBJS)\monolib_textbuf.o: ../../src/common/textbuf.cpp
$(OBJS)\monolib_textfile.o: ../../src/common/textfile.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_timerimpl.o: ../../src/common/timerimpl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_tokenzr.o: ../../src/common/tokenzr.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7736,6 +7737,9 @@ $(OBJS)\monolib_stdpaths.o: ../../src/msw/stdpaths.cpp
$(OBJS)\monolib_thread.o: ../../src/msw/thread.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_utils.o: ../../src/msw/utils.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8472,11 +8476,6 @@ $(OBJS)\monolib_settings.o: ../../src/msw/settings.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_tooltip.o: ../../src/msw/tooltip.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -9307,11 +9306,6 @@ $(OBJS)\monolib_textcmn.o: ../../src/common/textcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_toplvcmn.o: ../../src/common/toplvcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -9815,6 +9809,12 @@ $(OBJS)\basedll_textbuf.o: ../../src/common/textbuf.cpp
$(OBJS)\basedll_textfile.o: ../../src/common/textfile.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_timerimpl.o: ../../src/common/timerimpl.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_tokenzr.o: ../../src/common/tokenzr.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9893,6 +9893,9 @@ $(OBJS)\basedll_stdpaths.o: ../../src/msw/stdpaths.cpp
$(OBJS)\basedll_thread.o: ../../src/msw/thread.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_utils.o: ../../src/msw/utils.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10100,6 +10103,12 @@ $(OBJS)\baselib_textbuf.o: ../../src/common/textbuf.cpp
$(OBJS)\baselib_textfile.o: ../../src/common/textfile.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_timerimpl.o: ../../src/common/timerimpl.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_tokenzr.o: ../../src/common/tokenzr.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10178,6 +10187,9 @@ $(OBJS)\baselib_stdpaths.o: ../../src/msw/stdpaths.cpp
$(OBJS)\baselib_thread.o: ../../src/msw/thread.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_utils.o: ../../src/msw/utils.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10659,11 +10671,6 @@ $(OBJS)\coredll_settings.o: ../../src/msw/settings.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_tooltip.o: ../../src/msw/tooltip.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11494,11 +11501,6 @@ $(OBJS)\coredll_textcmn.o: ../../src/common/textcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_toplvcmn.o: ../../src/common/toplvcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12059,11 +12061,6 @@ $(OBJS)\corelib_settings.o: ../../src/msw/settings.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_timer.o: ../../src/msw/timer.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_tooltip.o: ../../src/msw/tooltip.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12894,11 +12891,6 @@ $(OBJS)\corelib_textcmn.o: ../../src/common/textcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_timercmn.o: ../../src/common/timercmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_toplvcmn.o: ../../src/common/toplvcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

108
build/msw/makefile.vc
View File

@@ -351,6 +351,8 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_tarstrm.obj \
$(OBJS)\monodll_textbuf.obj \
$(OBJS)\monodll_textfile.obj \
$(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_timerimpl.obj \
$(OBJS)\monodll_tokenzr.obj \
$(OBJS)\monodll_txtstrm.obj \
$(OBJS)\monodll_unichar.obj \
@@ -377,6 +379,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_stackwalk.obj \
$(OBJS)\monodll_stdpaths.obj \
$(OBJS)\monodll_thread.obj \
$(OBJS)\monodll_timer.obj \
$(OBJS)\monodll_utils.obj \
$(OBJS)\monodll_utilsexc.obj \
$(OBJS)\monodll_event.obj \
@@ -486,6 +489,8 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_tarstrm.obj \
$(OBJS)\monolib_textbuf.obj \
$(OBJS)\monolib_textfile.obj \
$(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_timerimpl.obj \
$(OBJS)\monolib_tokenzr.obj \
$(OBJS)\monolib_txtstrm.obj \
$(OBJS)\monolib_unichar.obj \
@@ -512,6 +517,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_stackwalk.obj \
$(OBJS)\monolib_stdpaths.obj \
$(OBJS)\monolib_thread.obj \
$(OBJS)\monolib_timer.obj \
$(OBJS)\monolib_utils.obj \
$(OBJS)\monolib_utilsexc.obj \
$(OBJS)\monolib_event.obj \
@@ -619,6 +625,8 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_tarstrm.obj \
$(OBJS)\basedll_textbuf.obj \
$(OBJS)\basedll_textfile.obj \
$(OBJS)\basedll_timercmn.obj \
$(OBJS)\basedll_timerimpl.obj \
$(OBJS)\basedll_tokenzr.obj \
$(OBJS)\basedll_txtstrm.obj \
$(OBJS)\basedll_unichar.obj \
@@ -645,6 +653,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_stackwalk.obj \
$(OBJS)\basedll_stdpaths.obj \
$(OBJS)\basedll_thread.obj \
$(OBJS)\basedll_timer.obj \
$(OBJS)\basedll_utils.obj \
$(OBJS)\basedll_utilsexc.obj \
$(OBJS)\basedll_event.obj \
@@ -736,6 +745,8 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_tarstrm.obj \
$(OBJS)\baselib_textbuf.obj \
$(OBJS)\baselib_textfile.obj \
$(OBJS)\baselib_timercmn.obj \
$(OBJS)\baselib_timerimpl.obj \
$(OBJS)\baselib_tokenzr.obj \
$(OBJS)\baselib_txtstrm.obj \
$(OBJS)\baselib_unichar.obj \
@@ -762,6 +773,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_stackwalk.obj \
$(OBJS)\baselib_stdpaths.obj \
$(OBJS)\baselib_thread.obj \
$(OBJS)\baselib_timer.obj \
$(OBJS)\baselib_utils.obj \
$(OBJS)\baselib_utilsexc.obj \
$(OBJS)\baselib_event.obj \
@@ -1690,7 +1702,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_timer.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_utilsgui.obj \
@@ -1834,7 +1845,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_valgen.obj \
@@ -1917,7 +1927,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_timer.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_utilsgui.obj \
@@ -2064,7 +2073,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_timercmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_valgen.obj \
@@ -2327,7 +2335,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_timer.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_utilsgui.obj \
@@ -2471,7 +2478,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_valgen.obj \
@@ -2554,7 +2560,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_timer.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_utilsgui.obj \
@@ -2701,7 +2706,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_timercmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_valgen.obj \
@@ -2905,7 +2909,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_timer.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_utilsgui.obj \
@@ -3049,7 +3052,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_valgen.obj \
@@ -3132,7 +3134,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_timer.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_utilsgui.obj \
@@ -3279,7 +3280,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_timercmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_valgen.obj \
@@ -3372,7 +3372,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_timer.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_utilsgui.obj \
@@ -3516,7 +3515,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_valgen.obj \
@@ -3599,7 +3597,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_timer.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_utilsgui.obj \
@@ -3746,7 +3743,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_timercmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_valgen.obj \
@@ -4509,7 +4505,7 @@ clean:
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
cd ..\..\samples
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd $(MAKEDIR)
cd "$(MAKEDIR)"
setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
@@ -4862,7 +4858,7 @@ wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
sub_samples:
cd ..\..\samples
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd $(MAKEDIR)
cd "$(MAKEDIR)"
$(LIBDIRNAME):
if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
@@ -5692,6 +5688,12 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5770,6 +5772,9 @@ $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6506,11 +6511,6 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7241,11 +7241,6 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7749,6 +7744,12 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7827,6 +7828,9 @@ $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8563,11 +8567,6 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -9298,11 +9297,6 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -9806,6 +9800,12 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
@@ -9884,6 +9884,9 @@ $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
@@ -10091,6 +10094,12 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
@@ -10169,6 +10178,9 @@ $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
$(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
@@ -10650,11 +10662,6 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -11385,11 +11392,6 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -11950,11 +11952,6 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_timer.obj: ..\..\src\msw\timer.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -12685,11 +12682,6 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_timercmn.obj: ..\..\src\common\timercmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

104
build/msw/makefile.wat
View File

@@ -256,7 +256,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_region.obj &
$(OBJS)\monodll_renderer.obj &
$(OBJS)\monodll_settings.obj &
$(OBJS)\monodll_timer.obj &
$(OBJS)\monodll_tooltip.obj &
$(OBJS)\monodll_toplevel.obj &
$(OBJS)\monodll_utilsgui.obj &
@@ -400,7 +399,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_stockitem.obj &
$(OBJS)\monodll_tbarbase.obj &
$(OBJS)\monodll_textcmn.obj &
$(OBJS)\monodll_timercmn.obj &
$(OBJS)\monodll_toplvcmn.obj &
$(OBJS)\monodll_treebase.obj &
$(OBJS)\monodll_valgen.obj &
@@ -485,7 +483,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_region.obj &
$(OBJS)\monodll_renderer.obj &
$(OBJS)\monodll_settings.obj &
$(OBJS)\monodll_timer.obj &
$(OBJS)\monodll_tooltip.obj &
$(OBJS)\monodll_toplevel.obj &
$(OBJS)\monodll_utilsgui.obj &
@@ -632,7 +629,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_stockitem.obj &
$(OBJS)\monodll_tbarbase.obj &
$(OBJS)\monodll_textcmn.obj &
$(OBJS)\monodll_timercmn.obj &
$(OBJS)\monodll_toplvcmn.obj &
$(OBJS)\monodll_treebase.obj &
$(OBJS)\monodll_valgen.obj &
@@ -897,7 +893,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_region.obj &
$(OBJS)\monolib_renderer.obj &
$(OBJS)\monolib_settings.obj &
$(OBJS)\monolib_timer.obj &
$(OBJS)\monolib_tooltip.obj &
$(OBJS)\monolib_toplevel.obj &
$(OBJS)\monolib_utilsgui.obj &
@@ -1041,7 +1036,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_stockitem.obj &
$(OBJS)\monolib_tbarbase.obj &
$(OBJS)\monolib_textcmn.obj &
$(OBJS)\monolib_timercmn.obj &
$(OBJS)\monolib_toplvcmn.obj &
$(OBJS)\monolib_treebase.obj &
$(OBJS)\monolib_valgen.obj &
@@ -1126,7 +1120,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_region.obj &
$(OBJS)\monolib_renderer.obj &
$(OBJS)\monolib_settings.obj &
$(OBJS)\monolib_timer.obj &
$(OBJS)\monolib_tooltip.obj &
$(OBJS)\monolib_toplevel.obj &
$(OBJS)\monolib_utilsgui.obj &
@@ -1273,7 +1266,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_stockitem.obj &
$(OBJS)\monolib_tbarbase.obj &
$(OBJS)\monolib_textcmn.obj &
$(OBJS)\monolib_timercmn.obj &
$(OBJS)\monolib_toplvcmn.obj &
$(OBJS)\monolib_treebase.obj &
$(OBJS)\monolib_valgen.obj &
@@ -1472,7 +1464,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_region.obj &
$(OBJS)\coredll_renderer.obj &
$(OBJS)\coredll_settings.obj &
$(OBJS)\coredll_timer.obj &
$(OBJS)\coredll_tooltip.obj &
$(OBJS)\coredll_toplevel.obj &
$(OBJS)\coredll_utilsgui.obj &
@@ -1616,7 +1607,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_stockitem.obj &
$(OBJS)\coredll_tbarbase.obj &
$(OBJS)\coredll_textcmn.obj &
$(OBJS)\coredll_timercmn.obj &
$(OBJS)\coredll_toplvcmn.obj &
$(OBJS)\coredll_treebase.obj &
$(OBJS)\coredll_valgen.obj &
@@ -1701,7 +1691,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_region.obj &
$(OBJS)\coredll_renderer.obj &
$(OBJS)\coredll_settings.obj &
$(OBJS)\coredll_timer.obj &
$(OBJS)\coredll_tooltip.obj &
$(OBJS)\coredll_toplevel.obj &
$(OBJS)\coredll_utilsgui.obj &
@@ -1848,7 +1837,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_stockitem.obj &
$(OBJS)\coredll_tbarbase.obj &
$(OBJS)\coredll_textcmn.obj &
$(OBJS)\coredll_timercmn.obj &
$(OBJS)\coredll_toplvcmn.obj &
$(OBJS)\coredll_treebase.obj &
$(OBJS)\coredll_valgen.obj &
@@ -1943,7 +1931,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_region.obj &
$(OBJS)\corelib_renderer.obj &
$(OBJS)\corelib_settings.obj &
$(OBJS)\corelib_timer.obj &
$(OBJS)\corelib_tooltip.obj &
$(OBJS)\corelib_toplevel.obj &
$(OBJS)\corelib_utilsgui.obj &
@@ -2087,7 +2074,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_stockitem.obj &
$(OBJS)\corelib_tbarbase.obj &
$(OBJS)\corelib_textcmn.obj &
$(OBJS)\corelib_timercmn.obj &
$(OBJS)\corelib_toplvcmn.obj &
$(OBJS)\corelib_treebase.obj &
$(OBJS)\corelib_valgen.obj &
@@ -2172,7 +2158,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_region.obj &
$(OBJS)\corelib_renderer.obj &
$(OBJS)\corelib_settings.obj &
$(OBJS)\corelib_timer.obj &
$(OBJS)\corelib_tooltip.obj &
$(OBJS)\corelib_toplevel.obj &
$(OBJS)\corelib_utilsgui.obj &
@@ -2319,7 +2304,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_stockitem.obj &
$(OBJS)\corelib_tbarbase.obj &
$(OBJS)\corelib_textcmn.obj &
$(OBJS)\corelib_timercmn.obj &
$(OBJS)\corelib_toplvcmn.obj &
$(OBJS)\corelib_treebase.obj &
$(OBJS)\corelib_valgen.obj &
@@ -3292,6 +3276,8 @@ MONODLL_OBJECTS = &
$(OBJS)\monodll_tarstrm.obj &
$(OBJS)\monodll_textbuf.obj &
$(OBJS)\monodll_textfile.obj &
$(OBJS)\monodll_timercmn.obj &
$(OBJS)\monodll_timerimpl.obj &
$(OBJS)\monodll_tokenzr.obj &
$(OBJS)\monodll_txtstrm.obj &
$(OBJS)\monodll_unichar.obj &
@@ -3318,6 +3304,7 @@ MONODLL_OBJECTS = &
$(OBJS)\monodll_stackwalk.obj &
$(OBJS)\monodll_stdpaths.obj &
$(OBJS)\monodll_thread.obj &
$(OBJS)\monodll_timer.obj &
$(OBJS)\monodll_utils.obj &
$(OBJS)\monodll_utilsexc.obj &
$(OBJS)\monodll_event.obj &
@@ -3422,6 +3409,8 @@ MONOLIB_OBJECTS = &
$(OBJS)\monolib_tarstrm.obj &
$(OBJS)\monolib_textbuf.obj &
$(OBJS)\monolib_textfile.obj &
$(OBJS)\monolib_timercmn.obj &
$(OBJS)\monolib_timerimpl.obj &
$(OBJS)\monolib_tokenzr.obj &
$(OBJS)\monolib_txtstrm.obj &
$(OBJS)\monolib_unichar.obj &
@@ -3448,6 +3437,7 @@ MONOLIB_OBJECTS = &
$(OBJS)\monolib_stackwalk.obj &
$(OBJS)\monolib_stdpaths.obj &
$(OBJS)\monolib_thread.obj &
$(OBJS)\monolib_timer.obj &
$(OBJS)\monolib_utils.obj &
$(OBJS)\monolib_utilsexc.obj &
$(OBJS)\monolib_event.obj &
@@ -3550,6 +3540,8 @@ BASEDLL_OBJECTS = &
$(OBJS)\basedll_tarstrm.obj &
$(OBJS)\basedll_textbuf.obj &
$(OBJS)\basedll_textfile.obj &
$(OBJS)\basedll_timercmn.obj &
$(OBJS)\basedll_timerimpl.obj &
$(OBJS)\basedll_tokenzr.obj &
$(OBJS)\basedll_txtstrm.obj &
$(OBJS)\basedll_unichar.obj &
@@ -3576,6 +3568,7 @@ BASEDLL_OBJECTS = &
$(OBJS)\basedll_stackwalk.obj &
$(OBJS)\basedll_stdpaths.obj &
$(OBJS)\basedll_thread.obj &
$(OBJS)\basedll_timer.obj &
$(OBJS)\basedll_utils.obj &
$(OBJS)\basedll_utilsexc.obj &
$(OBJS)\basedll_event.obj &
@@ -3662,6 +3655,8 @@ BASELIB_OBJECTS = &
$(OBJS)\baselib_tarstrm.obj &
$(OBJS)\baselib_textbuf.obj &
$(OBJS)\baselib_textfile.obj &
$(OBJS)\baselib_timercmn.obj &
$(OBJS)\baselib_timerimpl.obj &
$(OBJS)\baselib_tokenzr.obj &
$(OBJS)\baselib_txtstrm.obj &
$(OBJS)\baselib_unichar.obj &
@@ -3688,6 +3683,7 @@ BASELIB_OBJECTS = &
$(OBJS)\baselib_stackwalk.obj &
$(OBJS)\baselib_stdpaths.obj &
$(OBJS)\baselib_thread.obj &
$(OBJS)\baselib_timer.obj &
$(OBJS)\baselib_utils.obj &
$(OBJS)\baselib_utilsexc.obj &
$(OBJS)\baselib_event.obj &
@@ -5772,6 +5768,12 @@ $(OBJS)\monodll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
$(OBJS)\monodll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5850,6 +5852,9 @@ $(OBJS)\monodll_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp
$(OBJS)\monodll_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6586,11 +6591,6 @@ $(OBJS)\monodll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7421,11 +7421,6 @@ $(OBJS)\monodll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7929,6 +7924,12 @@ $(OBJS)\monolib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
$(OBJS)\monolib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8007,6 +8008,9 @@ $(OBJS)\monolib_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp
$(OBJS)\monolib_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8743,11 +8747,6 @@ $(OBJS)\monolib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -9578,11 +9577,6 @@ $(OBJS)\monolib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10086,6 +10080,12 @@ $(OBJS)\basedll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
$(OBJS)\basedll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -10164,6 +10164,9 @@ $(OBJS)\basedll_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp
$(OBJS)\basedll_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -10371,6 +10374,12 @@ $(OBJS)\baselib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
$(OBJS)\baselib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
@@ -10449,6 +10458,9 @@ $(OBJS)\baselib_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp
$(OBJS)\baselib_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
@@ -10930,11 +10942,6 @@ $(OBJS)\coredll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -11765,11 +11772,6 @@ $(OBJS)\coredll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -12330,11 +12332,6 @@ $(OBJS)\corelib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -13165,11 +13162,6 @@ $(OBJS)\corelib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

12
build/msw/wx_base.dsp
View File

@@ -707,6 +707,14 @@ SOURCE=..\..\src\common\textfile.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\timercmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\timerimpl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\tokenzr.cpp
# End Source File
# Begin Source File
@@ -827,6 +835,10 @@ SOURCE=..\..\src\msw\thread.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\timer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\utils.cpp
# End Source File
# Begin Source File

16
build/msw/wx_core.dsp
View File

@@ -814,10 +814,6 @@ SOURCE=..\..\src\common\textcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\timercmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\toplvcmn.cpp
# End Source File
# Begin Source File
@@ -3873,10 +3869,6 @@ SOURCE=..\..\src\msw\tglbtn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\timer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\tooltip.cpp
# End Source File
# Begin Source File
@@ -8185,10 +8177,6 @@ SOURCE=..\..\include\wx\msw\tglbtn.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\timer.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\tooltip.h
# End Source File
# Begin Source File
@@ -8417,10 +8405,6 @@ SOURCE=..\..\include\wx\generic\textdlgg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\timer.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\treectlg.h
# End Source File
# Begin Source File