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

Refactor wxXRC to allow defining handlers outside of xrc library.

Browse Source 
Split wxXmlResourceHandler into an ABC and the real implementation to allow
referencing the ABC in the core library itself but without pulling in all of
the XRC into it. This also allows defining XRC handlers, which only depend on
this ABC and not the xrc library, in other libraries, such as richtext, as
demonstrated by the now enabled wxRichTextXMLHandler.

Closes #10996.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-23 13:51:32 +00:00
parent 4dca3e02a6
commit a3b9c43bbc
23 changed files with 1169 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/bakefiles/files.bkl
View File

@@ -784,6 +784,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/treebkg.cpp
src/generic/vlbox.cpp
src/generic/vscroll.cpp
src/xrc/xmlreshandler.cpp
</set>
<set var="GUI_CMN_HDR" hints="files">
wx/affinematrix2dbase.h
@@ -1013,6 +1014,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/vscroll.h
wx/xpmdecod.h
wx/xpmhand.h
wx/xrc/xmlreshandler.h
</set>
<!-- ====================================================================== -->
@@ -3428,8 +3430,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_propdlg.cpp
src/xrc/xh_radbt.cpp
src/xrc/xh_radbx.cpp
<!-- disabled until linking problems are fixed -->
<!-- src/xrc/xh_richtext.cpp -->
src/xrc/xh_scrol.cpp
src/xrc/xh_scwin.cpp
src/xrc/xh_htmllbox.cpp
@@ -3498,7 +3498,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xrc/xh_propdlg.h
wx/xrc/xh_radbt.h
wx/xrc/xh_radbx.h
<!-- wx/xrc/xh_richtext.h -->
wx/xrc/xh_scrol.h
wx/xrc/xh_scwin.h
wx/xrc/xh_htmllbox.h
@@ -3715,6 +3714,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/richtext/richtextstyles.cpp
src/richtext/richtextsymboldlg.cpp
src/richtext/richtextxml.cpp
src/xrc/xh_richtext.cpp
</set>
<set var="RICHTEXT_HDR" hints="files">
wx/richtext/richtextbackgroundpage.h
@@ -3739,6 +3739,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/richtext/richtexttabspage.h
wx/richtext/richtextuicustomization.h
wx/richtext/richtextxml.h
wx/xrc/xh_richtext.h
</set>

176
build/msw/makefile.bcc
View File

@@ -1463,7 +1463,8 @@ RICHTEXTDLL_OBJECTS = \
$(OBJS)\richtextdll_richtextstyledlg.obj \
$(OBJS)\richtextdll_richtextstyles.obj \
$(OBJS)\richtextdll_richtextsymboldlg.obj \
$(OBJS)\richtextdll_richtextxml.obj
$(OBJS)\richtextdll_richtextxml.obj \
$(OBJS)\richtextdll_xh_richtext.obj
RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1484,7 +1485,8 @@ RICHTEXTLIB_OBJECTS = \
$(OBJS)\richtextlib_richtextstyledlg.obj \
$(OBJS)\richtextlib_richtextstyles.obj \
$(OBJS)\richtextlib_richtextsymboldlg.obj \
$(OBJS)\richtextlib_richtextxml.obj
$(OBJS)\richtextlib_richtextxml.obj \
$(OBJS)\richtextlib_xh_richtext.obj
STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1748,6 +1750,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_richtextstyles.obj \
$(OBJS)\monodll_richtextsymboldlg.obj \
$(OBJS)\monodll_richtextxml.obj \
$(OBJS)\monodll_xh_richtext.obj \
$(OBJS)\monodll_stc.obj \
$(OBJS)\monodll_PlatWX.obj \
$(OBJS)\monodll_ScintillaWX.obj
@@ -1796,7 +1799,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_uiaction.obj \
@@ -1982,7 +1985,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_uiactioncmn.obj \
@@ -2027,7 +2030,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj \
$(OBJS)\monodll_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -2073,7 +2077,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_uiaction.obj \
@@ -2253,7 +2257,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_uiactioncmn.obj \
@@ -2298,7 +2302,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj \
$(OBJS)\monodll_xmlreshandler.obj
!endif
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
@@ -2543,6 +2548,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_richtextstyles.obj \
$(OBJS)\monolib_richtextsymboldlg.obj \
$(OBJS)\monolib_richtextxml.obj \
$(OBJS)\monolib_xh_richtext.obj \
$(OBJS)\monolib_stc.obj \
$(OBJS)\monolib_PlatWX.obj \
$(OBJS)\monolib_ScintillaWX.obj
@@ -2591,7 +2597,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_uiaction.obj \
@@ -2777,7 +2783,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_uiactioncmn.obj \
@@ -2822,7 +2828,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj \
$(OBJS)\monolib_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -2868,7 +2875,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_uiaction.obj \
@@ -3048,7 +3055,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_uiactioncmn.obj \
@@ -3093,7 +3100,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj \
$(OBJS)\monolib_xmlreshandler.obj
!endif
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
@@ -3267,7 +3275,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_uiaction.obj \
@@ -3453,7 +3461,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_uiactioncmn.obj \
@@ -3498,7 +3506,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj \
$(OBJS)\coredll_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_2_OBJECTS = \
@@ -3544,7 +3553,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_uiaction.obj \
@@ -3724,7 +3733,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_uiactioncmn.obj \
@@ -3769,7 +3778,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj \
$(OBJS)\coredll_xmlreshandler.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
__corelib___depname = \
@@ -3819,7 +3829,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_uiaction.obj \
@@ -4005,7 +4015,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_uiactioncmn.obj \
@@ -4050,7 +4060,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj \
$(OBJS)\corelib_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_3_OBJECTS = \
@@ -4096,7 +4107,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_uiaction.obj \
@@ -4276,7 +4287,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_uiactioncmn.obj \
@@ -4321,7 +4332,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj \
$(OBJS)\corelib_xmlreshandler.obj
!endif
!if "$(SHARED)" == "1"
____wxcore_namedll_DEP = $(__coredll___depname)
@@ -7286,6 +7298,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -7512,11 +7527,11 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -8172,11 +8187,11 @@ $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -8401,6 +8416,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -9722,6 +9742,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -9948,11 +9971,11 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -10608,11 +10631,11 @@ $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -10837,6 +10860,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -12348,11 +12376,11 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -13008,11 +13036,11 @@ $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -13237,6 +13265,11 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -13778,11 +13811,11 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -14438,11 +14471,11 @@ $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -14667,6 +14700,11 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -15855,6 +15893,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -15888,6 +15929,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp

176
build/msw/makefile.gcc
View File

@@ -1467,7 +1467,8 @@ RICHTEXTDLL_OBJECTS = \
$(OBJS)\richtextdll_richtextstyledlg.o \
$(OBJS)\richtextdll_richtextstyles.o \
$(OBJS)\richtextdll_richtextsymboldlg.o \
$(OBJS)\richtextdll_richtextxml.o
$(OBJS)\richtextdll_richtextxml.o \
$(OBJS)\richtextdll_xh_richtext.o
RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1488,7 +1489,8 @@ RICHTEXTLIB_OBJECTS = \
$(OBJS)\richtextlib_richtextstyledlg.o \
$(OBJS)\richtextlib_richtextstyles.o \
$(OBJS)\richtextlib_richtextsymboldlg.o \
$(OBJS)\richtextlib_richtextxml.o
$(OBJS)\richtextlib_richtextxml.o \
$(OBJS)\richtextlib_xh_richtext.o
STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1760,6 +1762,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_richtextstyles.o \
$(OBJS)\monodll_richtextsymboldlg.o \
$(OBJS)\monodll_richtextxml.o \
$(OBJS)\monodll_xh_richtext.o \
$(OBJS)\monodll_stc.o \
$(OBJS)\monodll_PlatWX.o \
$(OBJS)\monodll_ScintillaWX.o
@@ -1809,7 +1812,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.o \
$(OBJS)\monodll_renderer.o \
$(OBJS)\monodll_settings.o \
$(OBJS)\monodll_textmeasure.o \
$(OBJS)\monodll_textmeasure.o \
$(OBJS)\monodll_tooltip.o \
$(OBJS)\monodll_toplevel.o \
$(OBJS)\monodll_uiaction.o \
@@ -1995,7 +1998,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
$(OBJS)\monodll_textentrycmn.o \
$(OBJS)\monodll_textmeasurecmn.o \
$(OBJS)\monodll_textmeasurecmn.o \
$(OBJS)\monodll_toplvcmn.o \
$(OBJS)\monodll_treebase.o \
$(OBJS)\monodll_uiactioncmn.o \
@@ -2040,7 +2043,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.o \
$(OBJS)\monodll_treebkg.o \
$(OBJS)\monodll_vlbox.o \
$(OBJS)\monodll_vscroll.o
$(OBJS)\monodll_vscroll.o \
$(OBJS)\monodll_xmlreshandler.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -2088,7 +2092,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.o \
$(OBJS)\monodll_renderer.o \
$(OBJS)\monodll_settings.o \
$(OBJS)\monodll_textmeasure.o \
$(OBJS)\monodll_textmeasure.o \
$(OBJS)\monodll_tooltip.o \
$(OBJS)\monodll_toplevel.o \
$(OBJS)\monodll_uiaction.o \
@@ -2268,7 +2272,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
$(OBJS)\monodll_textentrycmn.o \
$(OBJS)\monodll_textmeasurecmn.o \
$(OBJS)\monodll_textmeasurecmn.o \
$(OBJS)\monodll_toplvcmn.o \
$(OBJS)\monodll_treebase.o \
$(OBJS)\monodll_uiactioncmn.o \
@@ -2313,7 +2317,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.o \
$(OBJS)\monodll_treebkg.o \
$(OBJS)\monodll_vlbox.o \
$(OBJS)\monodll_vscroll.o
$(OBJS)\monodll_vscroll.o \
$(OBJS)\monodll_xmlreshandler.o
endif
endif
ifeq ($(WXUNIV),0)
@@ -2561,6 +2566,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_richtextstyles.o \
$(OBJS)\monolib_richtextsymboldlg.o \
$(OBJS)\monolib_richtextxml.o \
$(OBJS)\monolib_xh_richtext.o \
$(OBJS)\monolib_stc.o \
$(OBJS)\monolib_PlatWX.o \
$(OBJS)\monolib_ScintillaWX.o
@@ -2610,7 +2616,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.o \
$(OBJS)\monolib_renderer.o \
$(OBJS)\monolib_settings.o \
$(OBJS)\monolib_textmeasure.o \
$(OBJS)\monolib_textmeasure.o \
$(OBJS)\monolib_tooltip.o \
$(OBJS)\monolib_toplevel.o \
$(OBJS)\monolib_uiaction.o \
@@ -2796,7 +2802,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
$(OBJS)\monolib_textentrycmn.o \
$(OBJS)\monolib_textmeasurecmn.o \
$(OBJS)\monolib_textmeasurecmn.o \
$(OBJS)\monolib_toplvcmn.o \
$(OBJS)\monolib_treebase.o \
$(OBJS)\monolib_uiactioncmn.o \
@@ -2841,7 +2847,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.o \
$(OBJS)\monolib_treebkg.o \
$(OBJS)\monolib_vlbox.o \
$(OBJS)\monolib_vscroll.o
$(OBJS)\monolib_vscroll.o \
$(OBJS)\monolib_xmlreshandler.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -2889,7 +2896,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.o \
$(OBJS)\monolib_renderer.o \
$(OBJS)\monolib_settings.o \
$(OBJS)\monolib_textmeasure.o \
$(OBJS)\monolib_textmeasure.o \
$(OBJS)\monolib_tooltip.o \
$(OBJS)\monolib_toplevel.o \
$(OBJS)\monolib_uiaction.o \
@@ -3069,7 +3076,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
$(OBJS)\monolib_textentrycmn.o \
$(OBJS)\monolib_textmeasurecmn.o \
$(OBJS)\monolib_textmeasurecmn.o \
$(OBJS)\monolib_toplvcmn.o \
$(OBJS)\monolib_treebase.o \
$(OBJS)\monolib_uiactioncmn.o \
@@ -3114,7 +3121,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.o \
$(OBJS)\monolib_treebkg.o \
$(OBJS)\monolib_vlbox.o \
$(OBJS)\monolib_vscroll.o
$(OBJS)\monolib_vscroll.o \
$(OBJS)\monolib_xmlreshandler.o
endif
endif
ifeq ($(WXUNIV),0)
@@ -3302,7 +3310,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.o \
$(OBJS)\coredll_renderer.o \
$(OBJS)\coredll_settings.o \
$(OBJS)\coredll_textmeasure.o \
$(OBJS)\coredll_textmeasure.o \
$(OBJS)\coredll_tooltip.o \
$(OBJS)\coredll_toplevel.o \
$(OBJS)\coredll_uiaction.o \
@@ -3488,7 +3496,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
$(OBJS)\coredll_textentrycmn.o \
$(OBJS)\coredll_textmeasurecmn.o \
$(OBJS)\coredll_textmeasurecmn.o \
$(OBJS)\coredll_toplvcmn.o \
$(OBJS)\coredll_treebase.o \
$(OBJS)\coredll_uiactioncmn.o \
@@ -3533,7 +3541,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.o \
$(OBJS)\coredll_treebkg.o \
$(OBJS)\coredll_vlbox.o \
$(OBJS)\coredll_vscroll.o
$(OBJS)\coredll_vscroll.o \
$(OBJS)\coredll_xmlreshandler.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -3581,7 +3590,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.o \
$(OBJS)\coredll_renderer.o \
$(OBJS)\coredll_settings.o \
$(OBJS)\coredll_textmeasure.o \
$(OBJS)\coredll_textmeasure.o \
$(OBJS)\coredll_tooltip.o \
$(OBJS)\coredll_toplevel.o \
$(OBJS)\coredll_uiaction.o \
@@ -3761,7 +3770,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
$(OBJS)\coredll_textentrycmn.o \
$(OBJS)\coredll_textmeasurecmn.o \
$(OBJS)\coredll_textmeasurecmn.o \
$(OBJS)\coredll_toplvcmn.o \
$(OBJS)\coredll_treebase.o \
$(OBJS)\coredll_uiactioncmn.o \
@@ -3806,7 +3815,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.o \
$(OBJS)\coredll_treebkg.o \
$(OBJS)\coredll_vlbox.o \
$(OBJS)\coredll_vscroll.o
$(OBJS)\coredll_vscroll.o \
$(OBJS)\coredll_xmlreshandler.o
endif
endif
ifeq ($(MONOLITHIC),0)
@@ -3862,7 +3872,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.o \
$(OBJS)\corelib_renderer.o \
$(OBJS)\corelib_settings.o \
$(OBJS)\corelib_textmeasure.o \
$(OBJS)\corelib_textmeasure.o \
$(OBJS)\corelib_tooltip.o \
$(OBJS)\corelib_toplevel.o \
$(OBJS)\corelib_uiaction.o \
@@ -4048,7 +4058,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
$(OBJS)\corelib_textentrycmn.o \
$(OBJS)\corelib_textmeasurecmn.o \
$(OBJS)\corelib_textmeasurecmn.o \
$(OBJS)\corelib_toplvcmn.o \
$(OBJS)\corelib_treebase.o \
$(OBJS)\corelib_uiactioncmn.o \
@@ -4093,7 +4103,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.o \
$(OBJS)\corelib_treebkg.o \
$(OBJS)\corelib_vlbox.o \
$(OBJS)\corelib_vscroll.o
$(OBJS)\corelib_vscroll.o \
$(OBJS)\corelib_xmlreshandler.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -4141,7 +4152,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.o \
$(OBJS)\corelib_renderer.o \
$(OBJS)\corelib_settings.o \
$(OBJS)\corelib_textmeasure.o \
$(OBJS)\corelib_textmeasure.o \
$(OBJS)\corelib_tooltip.o \
$(OBJS)\corelib_toplevel.o \
$(OBJS)\corelib_uiaction.o \
@@ -4321,7 +4332,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
$(OBJS)\corelib_textentrycmn.o \
$(OBJS)\corelib_textmeasurecmn.o \
$(OBJS)\corelib_textmeasurecmn.o \
$(OBJS)\corelib_toplvcmn.o \
$(OBJS)\corelib_treebase.o \
$(OBJS)\corelib_uiactioncmn.o \
@@ -4366,7 +4377,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.o \
$(OBJS)\corelib_treebkg.o \
$(OBJS)\corelib_vlbox.o \
$(OBJS)\corelib_vscroll.o
$(OBJS)\corelib_vscroll.o \
$(OBJS)\corelib_xmlreshandler.o
endif
endif
ifeq ($(SHARED),1)
@@ -7455,6 +7467,9 @@ $(OBJS)\monodll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp
$(OBJS)\monodll_richtextxml.o: ../../src/richtext/richtextxml.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_stc.o: ../../src/stc/stc.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7681,11 +7696,11 @@ $(OBJS)\monodll_settings.o: ../../src/msw/settings.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_textmeasure.o: ../../src/msw/textmeasure.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_textmeasure.o: ../../src/msw/textmeasure.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) $<
endif
@@ -8341,11 +8356,11 @@ $(OBJS)\monodll_textentrycmn.o: ../../src/common/textentrycmn.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_textmeasurecmn.o: ../../src/common/textmeasurecmn.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) $<
endif
@@ -8570,6 +8585,11 @@ $(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_animatecmn.o: ../../src/common/animatecmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9891,6 +9911,9 @@ $(OBJS)\monolib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp
$(OBJS)\monolib_richtextxml.o: ../../src/richtext/richtextxml.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_stc.o: ../../src/stc/stc.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10117,11 +10140,11 @@ $(OBJS)\monolib_settings.o: ../../src/msw/settings.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_textmeasure.o: ../../src/msw/textmeasure.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_textmeasure.o: ../../src/msw/textmeasure.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) $<
endif
@@ -10777,11 +10800,11 @@ $(OBJS)\monolib_textentrycmn.o: ../../src/common/textentrycmn.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_textmeasurecmn.o: ../../src/common/textmeasurecmn.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) $<
endif
@@ -11006,6 +11029,11 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_animatecmn.o: ../../src/common/animatecmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12517,11 +12545,11 @@ $(OBJS)\coredll_settings.o: ../../src/msw/settings.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_textmeasure.o: ../../src/msw/textmeasure.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_textmeasure.o: ../../src/msw/textmeasure.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) $<
endif
@@ -13177,11 +13205,11 @@ $(OBJS)\coredll_textentrycmn.o: ../../src/common/textentrycmn.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_textmeasurecmn.o: ../../src/common/textmeasurecmn.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) $<
endif
@@ -13406,6 +13434,11 @@ $(OBJS)\coredll_vscroll.o: ../../src/generic/vscroll.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13947,11 +13980,11 @@ $(OBJS)\corelib_settings.o: ../../src/msw/settings.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_textmeasure.o: ../../src/msw/textmeasure.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_textmeasure.o: ../../src/msw/textmeasure.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) $<
endif
@@ -14607,11 +14640,11 @@ $(OBJS)\corelib_textentrycmn.o: ../../src/common/textentrycmn.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_textmeasurecmn.o: ../../src/common/textmeasurecmn.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) $<
endif
@@ -14836,6 +14869,11 @@ $(OBJS)\corelib_vscroll.o: ../../src/generic/vscroll.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -16024,6 +16062,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cp
$(OBJS)\richtextdll_richtextxml.o: ../../src/richtext/richtextxml.cpp
$(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\richtextdll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp
$(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -16057,6 +16098,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cp
$(OBJS)\richtextlib_richtextxml.o: ../../src/richtext/richtextxml.cpp
$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\richtextlib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp
$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $<

176
build/msw/makefile.vc
View File

@@ -1630,7 +1630,8 @@ RICHTEXTDLL_OBJECTS = \
$(OBJS)\richtextdll_richtextstyledlg.obj \
$(OBJS)\richtextdll_richtextstyles.obj \
$(OBJS)\richtextdll_richtextsymboldlg.obj \
$(OBJS)\richtextdll_richtextxml.obj
$(OBJS)\richtextdll_richtextxml.obj \
$(OBJS)\richtextdll_xh_richtext.obj
RICHTEXTDLL_RESOURCES = \
$(OBJS)\richtextdll_version.res
RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \
@@ -1657,7 +1658,8 @@ RICHTEXTLIB_OBJECTS = \
$(OBJS)\richtextlib_richtextstyledlg.obj \
$(OBJS)\richtextlib_richtextstyles.obj \
$(OBJS)\richtextlib_richtextsymboldlg.obj \
$(OBJS)\richtextlib_richtextxml.obj
$(OBJS)\richtextlib_richtextxml.obj \
$(OBJS)\richtextlib_xh_richtext.obj
STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb \
@@ -2040,6 +2042,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_richtextstyles.obj \
$(OBJS)\monodll_richtextsymboldlg.obj \
$(OBJS)\monodll_richtextxml.obj \
$(OBJS)\monodll_xh_richtext.obj \
$(OBJS)\monodll_stc.obj \
$(OBJS)\monodll_PlatWX.obj \
$(OBJS)\monodll_ScintillaWX.obj
@@ -2088,7 +2091,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_uiaction.obj \
@@ -2274,7 +2277,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_uiactioncmn.obj \
@@ -2319,7 +2322,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj \
$(OBJS)\monodll_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -2365,7 +2369,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_uiaction.obj \
@@ -2545,7 +2549,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_uiactioncmn.obj \
@@ -2590,7 +2594,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj \
$(OBJS)\monodll_xmlreshandler.obj
!endif
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
@@ -2841,6 +2846,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_richtextstyles.obj \
$(OBJS)\monolib_richtextsymboldlg.obj \
$(OBJS)\monolib_richtextxml.obj \
$(OBJS)\monolib_xh_richtext.obj \
$(OBJS)\monolib_stc.obj \
$(OBJS)\monolib_PlatWX.obj \
$(OBJS)\monolib_ScintillaWX.obj
@@ -2889,7 +2895,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_uiaction.obj \
@@ -3075,7 +3081,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_uiactioncmn.obj \
@@ -3120,7 +3126,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj \
$(OBJS)\monolib_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -3166,7 +3173,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_uiaction.obj \
@@ -3346,7 +3353,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_uiactioncmn.obj \
@@ -3391,7 +3398,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj \
$(OBJS)\monolib_xmlreshandler.obj
!endif
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
@@ -3631,7 +3639,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_uiaction.obj \
@@ -3817,7 +3825,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_uiactioncmn.obj \
@@ -3862,7 +3870,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj \
$(OBJS)\coredll_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_2_OBJECTS = \
@@ -3908,7 +3917,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_uiaction.obj \
@@ -4088,7 +4097,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_uiactioncmn.obj \
@@ -4133,7 +4142,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj \
$(OBJS)\coredll_xmlreshandler.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
__corelib___depname = \
@@ -4189,7 +4199,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_uiaction.obj \
@@ -4375,7 +4385,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_uiactioncmn.obj \
@@ -4420,7 +4430,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj \
$(OBJS)\corelib_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_3_OBJECTS = \
@@ -4466,7 +4477,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_uiaction.obj \
@@ -4646,7 +4657,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_uiactioncmn.obj \
@@ -4691,7 +4702,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj \
$(OBJS)\corelib_xmlreshandler.obj
!endif
!if "$(SHARED)" == "1"
____wxcore_namedll_DEP = $(__coredll___depname)
@@ -7970,6 +7982,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -8196,11 +8211,11 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -8856,11 +8871,11 @@ $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -9085,6 +9100,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -10406,6 +10426,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -10632,11 +10655,11 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -11292,11 +11315,11 @@ $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -11521,6 +11544,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -13032,11 +13060,11 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -13692,11 +13720,11 @@ $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -13921,6 +13949,11 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -14462,11 +14495,11 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -15122,11 +15155,11 @@ $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -15351,6 +15384,11 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -16539,6 +16577,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -16572,6 +16613,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

176
build/msw/makefile.wat
View File

@@ -252,6 +252,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_richtextstyles.obj &
$(OBJS)\monodll_richtextsymboldlg.obj &
$(OBJS)\monodll_richtextxml.obj &
$(OBJS)\monodll_xh_richtext.obj &
$(OBJS)\monodll_stc.obj &
$(OBJS)\monodll_PlatWX.obj &
$(OBJS)\monodll_ScintillaWX.obj
@@ -302,7 +303,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_region.obj &
$(OBJS)\monodll_renderer.obj &
$(OBJS)\monodll_settings.obj &
$(OBJS)\monodll_textmeasure.obj &
$(OBJS)\monodll_textmeasure.obj &
$(OBJS)\monodll_tooltip.obj &
$(OBJS)\monodll_toplevel.obj &
$(OBJS)\monodll_uiaction.obj &
@@ -488,7 +489,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_tbarbase.obj &
$(OBJS)\monodll_textcmn.obj &
$(OBJS)\monodll_textentrycmn.obj &
$(OBJS)\monodll_textmeasurecmn.obj &
$(OBJS)\monodll_textmeasurecmn.obj &
$(OBJS)\monodll_toplvcmn.obj &
$(OBJS)\monodll_treebase.obj &
$(OBJS)\monodll_uiactioncmn.obj &
@@ -533,7 +534,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_treectlg.obj &
$(OBJS)\monodll_treebkg.obj &
$(OBJS)\monodll_vlbox.obj &
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj &
$(OBJS)\monodll_xmlreshandler.obj
!endif
!endif
!ifeq USE_GUI 1
@@ -581,7 +583,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_region.obj &
$(OBJS)\monodll_renderer.obj &
$(OBJS)\monodll_settings.obj &
$(OBJS)\monodll_textmeasure.obj &
$(OBJS)\monodll_textmeasure.obj &
$(OBJS)\monodll_tooltip.obj &
$(OBJS)\monodll_toplevel.obj &
$(OBJS)\monodll_uiaction.obj &
@@ -761,7 +763,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_tbarbase.obj &
$(OBJS)\monodll_textcmn.obj &
$(OBJS)\monodll_textentrycmn.obj &
$(OBJS)\monodll_textmeasurecmn.obj &
$(OBJS)\monodll_textmeasurecmn.obj &
$(OBJS)\monodll_toplvcmn.obj &
$(OBJS)\monodll_treebase.obj &
$(OBJS)\monodll_uiactioncmn.obj &
@@ -806,7 +808,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_treectlg.obj &
$(OBJS)\monodll_treebkg.obj &
$(OBJS)\monodll_vlbox.obj &
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj &
$(OBJS)\monodll_xmlreshandler.obj
!endif
!endif
____ADVANCED_SRC_FILENAMES_OBJECTS =
@@ -1058,6 +1061,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_richtextstyles.obj &
$(OBJS)\monolib_richtextsymboldlg.obj &
$(OBJS)\monolib_richtextxml.obj &
$(OBJS)\monolib_xh_richtext.obj &
$(OBJS)\monolib_stc.obj &
$(OBJS)\monolib_PlatWX.obj &
$(OBJS)\monolib_ScintillaWX.obj
@@ -1108,7 +1112,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_region.obj &
$(OBJS)\monolib_renderer.obj &
$(OBJS)\monolib_settings.obj &
$(OBJS)\monolib_textmeasure.obj &
$(OBJS)\monolib_textmeasure.obj &
$(OBJS)\monolib_tooltip.obj &
$(OBJS)\monolib_toplevel.obj &
$(OBJS)\monolib_uiaction.obj &
@@ -1294,7 +1298,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_tbarbase.obj &
$(OBJS)\monolib_textcmn.obj &
$(OBJS)\monolib_textentrycmn.obj &
$(OBJS)\monolib_textmeasurecmn.obj &
$(OBJS)\monolib_textmeasurecmn.obj &
$(OBJS)\monolib_toplvcmn.obj &
$(OBJS)\monolib_treebase.obj &
$(OBJS)\monolib_uiactioncmn.obj &
@@ -1339,7 +1343,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_treectlg.obj &
$(OBJS)\monolib_treebkg.obj &
$(OBJS)\monolib_vlbox.obj &
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj &
$(OBJS)\monolib_xmlreshandler.obj
!endif
!endif
!ifeq USE_GUI 1
@@ -1387,7 +1392,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_region.obj &
$(OBJS)\monolib_renderer.obj &
$(OBJS)\monolib_settings.obj &
$(OBJS)\monolib_textmeasure.obj &
$(OBJS)\monolib_textmeasure.obj &
$(OBJS)\monolib_tooltip.obj &
$(OBJS)\monolib_toplevel.obj &
$(OBJS)\monolib_uiaction.obj &
@@ -1567,7 +1572,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_tbarbase.obj &
$(OBJS)\monolib_textcmn.obj &
$(OBJS)\monolib_textentrycmn.obj &
$(OBJS)\monolib_textmeasurecmn.obj &
$(OBJS)\monolib_textmeasurecmn.obj &
$(OBJS)\monolib_toplvcmn.obj &
$(OBJS)\monolib_treebase.obj &
$(OBJS)\monolib_uiactioncmn.obj &
@@ -1612,7 +1617,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_treectlg.obj &
$(OBJS)\monolib_treebkg.obj &
$(OBJS)\monolib_vlbox.obj &
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj &
$(OBJS)\monolib_xmlreshandler.obj
!endif
!endif
____ADVANCED_SRC_FILENAMES_1_OBJECTS =
@@ -1811,7 +1817,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_region.obj &
$(OBJS)\coredll_renderer.obj &
$(OBJS)\coredll_settings.obj &
$(OBJS)\coredll_textmeasure.obj &
$(OBJS)\coredll_textmeasure.obj &
$(OBJS)\coredll_tooltip.obj &
$(OBJS)\coredll_toplevel.obj &
$(OBJS)\coredll_uiaction.obj &
@@ -1997,7 +2003,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_tbarbase.obj &
$(OBJS)\coredll_textcmn.obj &
$(OBJS)\coredll_textentrycmn.obj &
$(OBJS)\coredll_textmeasurecmn.obj &
$(OBJS)\coredll_textmeasurecmn.obj &
$(OBJS)\coredll_toplvcmn.obj &
$(OBJS)\coredll_treebase.obj &
$(OBJS)\coredll_uiactioncmn.obj &
@@ -2042,7 +2048,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_treectlg.obj &
$(OBJS)\coredll_treebkg.obj &
$(OBJS)\coredll_vlbox.obj &
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj &
$(OBJS)\coredll_xmlreshandler.obj
!endif
!endif
!ifeq USE_GUI 1
@@ -2090,7 +2097,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_region.obj &
$(OBJS)\coredll_renderer.obj &
$(OBJS)\coredll_settings.obj &
$(OBJS)\coredll_textmeasure.obj &
$(OBJS)\coredll_textmeasure.obj &
$(OBJS)\coredll_tooltip.obj &
$(OBJS)\coredll_toplevel.obj &
$(OBJS)\coredll_uiaction.obj &
@@ -2270,7 +2277,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_tbarbase.obj &
$(OBJS)\coredll_textcmn.obj &
$(OBJS)\coredll_textentrycmn.obj &
$(OBJS)\coredll_textmeasurecmn.obj &
$(OBJS)\coredll_textmeasurecmn.obj &
$(OBJS)\coredll_toplvcmn.obj &
$(OBJS)\coredll_treebase.obj &
$(OBJS)\coredll_uiactioncmn.obj &
@@ -2315,7 +2322,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_treectlg.obj &
$(OBJS)\coredll_treebkg.obj &
$(OBJS)\coredll_vlbox.obj &
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj &
$(OBJS)\coredll_xmlreshandler.obj
!endif
!endif
__corelib___depname =
@@ -2373,7 +2381,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_region.obj &
$(OBJS)\corelib_renderer.obj &
$(OBJS)\corelib_settings.obj &
$(OBJS)\corelib_textmeasure.obj &
$(OBJS)\corelib_textmeasure.obj &
$(OBJS)\corelib_tooltip.obj &
$(OBJS)\corelib_toplevel.obj &
$(OBJS)\corelib_uiaction.obj &
@@ -2559,7 +2567,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_tbarbase.obj &
$(OBJS)\corelib_textcmn.obj &
$(OBJS)\corelib_textentrycmn.obj &
$(OBJS)\corelib_textmeasurecmn.obj &
$(OBJS)\corelib_textmeasurecmn.obj &
$(OBJS)\corelib_toplvcmn.obj &
$(OBJS)\corelib_treebase.obj &
$(OBJS)\corelib_uiactioncmn.obj &
@@ -2604,7 +2612,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_treectlg.obj &
$(OBJS)\corelib_treebkg.obj &
$(OBJS)\corelib_vlbox.obj &
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj &
$(OBJS)\corelib_xmlreshandler.obj
!endif
!endif
!ifeq USE_GUI 1
@@ -2652,7 +2661,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_region.obj &
$(OBJS)\corelib_renderer.obj &
$(OBJS)\corelib_settings.obj &
$(OBJS)\corelib_textmeasure.obj &
$(OBJS)\corelib_textmeasure.obj &
$(OBJS)\corelib_tooltip.obj &
$(OBJS)\corelib_toplevel.obj &
$(OBJS)\corelib_uiaction.obj &
@@ -2832,7 +2841,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_tbarbase.obj &
$(OBJS)\corelib_textcmn.obj &
$(OBJS)\corelib_textentrycmn.obj &
$(OBJS)\corelib_textmeasurecmn.obj &
$(OBJS)\corelib_textmeasurecmn.obj &
$(OBJS)\corelib_toplvcmn.obj &
$(OBJS)\corelib_treebase.obj &
$(OBJS)\corelib_uiactioncmn.obj &
@@ -2877,7 +2886,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_treectlg.obj &
$(OBJS)\corelib_treebkg.obj &
$(OBJS)\corelib_vlbox.obj &
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj &
$(OBJS)\corelib_xmlreshandler.obj
!endif
!endif
____wxcore_namedll_DEP =
@@ -5038,7 +5048,8 @@ RICHTEXTDLL_OBJECTS = &
$(OBJS)\richtextdll_richtextstyledlg.obj &
$(OBJS)\richtextdll_richtextstyles.obj &
$(OBJS)\richtextdll_richtextsymboldlg.obj &
$(OBJS)\richtextdll_richtextxml.obj
$(OBJS)\richtextdll_richtextxml.obj &
$(OBJS)\richtextdll_xh_richtext.obj
RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
@@ -5059,7 +5070,8 @@ RICHTEXTLIB_OBJECTS = &
$(OBJS)\richtextlib_richtextstyledlg.obj &
$(OBJS)\richtextlib_richtextstyles.obj &
$(OBJS)\richtextlib_richtextsymboldlg.obj &
$(OBJS)\richtextlib_richtextxml.obj
$(OBJS)\richtextlib_richtextxml.obj &
$(OBJS)\richtextlib_xh_richtext.obj
STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
@@ -7728,6 +7740,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtext
$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7954,11 +7969,11 @@ $(OBJS)\monodll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.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) $<
!endif
@@ -8614,11 +8629,11 @@ $(OBJS)\monodll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.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) $<
!endif
@@ -8843,6 +8858,11 @@ $(OBJS)\monodll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -10164,6 +10184,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtext
$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10390,11 +10413,11 @@ $(OBJS)\monolib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.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) $<
!endif
@@ -11050,11 +11073,11 @@ $(OBJS)\monolib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.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) $<
!endif
@@ -11279,6 +11302,11 @@ $(OBJS)\monolib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -12790,11 +12818,11 @@ $(OBJS)\coredll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.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) $<
!endif
@@ -13450,11 +13478,11 @@ $(OBJS)\coredll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.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) $<
!endif
@@ -13679,6 +13707,11 @@ $(OBJS)\coredll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
$(OBJS)\corelib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -14220,11 +14253,11 @@ $(OBJS)\corelib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.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) $<
!endif
@@ -14880,11 +14913,11 @@ $(OBJS)\corelib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.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) $<
!endif
@@ -15109,6 +15142,11 @@ $(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
$(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -16297,6 +16335,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\rich
$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
$(OBJS)\richtextdll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
@@ -16330,6 +16371,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\rich
$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
$(OBJS)\richtextlib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
$(OBJS)\stcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

32
build/msw/wx_core.dsp
View File

@@ -714,10 +714,10 @@ SOURCE=..\..\src\common\textentrycmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\textmeasurecmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\textmeasurecmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\toplvcmn.cpp
# End Source File
# Begin Source File
@@ -2712,10 +2712,10 @@ SOURCE=..\..\src\msw\textentry.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\textmeasure.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\textmeasure.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\tglbtn.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Release"
@@ -7268,6 +7268,10 @@ SOURCE=..\..\include\wx\xrc\xh_radbx.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_richtext.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_scrol.h
# End Source File
# Begin Source File
@@ -7356,6 +7360,10 @@ SOURCE=..\..\include\wx\xrc\xmlres.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xmlreshandler.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xpmdecod.h
# End Source File
# Begin Source File
@@ -7363,6 +7371,14 @@ SOURCE=..\..\include\wx\xpmdecod.h
SOURCE=..\..\include\wx\xpmhand.h
# End Source File
# End Group
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\xrc\xmlreshandler.cpp
# End Source File
# End Group
# End Target
# End Project

8
build/msw/wx_richtext.dsp
View File

@@ -616,6 +616,10 @@ SOURCE=..\..\include\wx\richtext\richtextuicustomization.h
SOURCE=..\..\include\wx\richtext\richtextxml.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_richtext.h
# End Source File
# End Group
# Begin Group "Source Files"
@@ -660,6 +664,10 @@ SOURCE=..\..\src\richtext\richtextsymboldlg.cpp
SOURCE=..\..\src\richtext\richtextxml.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xh_richtext.cpp
# End Source File
# End Group
# End Target
# End Project

14
build/msw/wx_vc7_core.vcproj
View File

@@ -6026,6 +6026,9 @@
<File
RelativePath="..\..\include\wx\xrc\xh_radbx.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_richtext.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_scrol.h">
</File>
@@ -6092,6 +6095,9 @@
<File
RelativePath="..\..\include\wx\xrc\xmlres.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xmlreshandler.h">
</File>
<File
RelativePath="..\..\include\wx\xpmdecod.h">
</File>
@@ -6099,6 +6105,14 @@
RelativePath="..\..\include\wx\xpmhand.h">
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\xrc\xmlreshandler.cpp">
</File>
</Filter>
</Files>
<Globals>

6
build/msw/wx_vc7_richtext.vcproj
View File

@@ -837,6 +837,9 @@
<File
RelativePath="..\..\include\wx\richtext\richtextxml.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_richtext.h">
</File>
</Filter>
<Filter
Name="Source Files"
@@ -872,6 +875,9 @@
<File
RelativePath="..\..\src\richtext\richtextxml.cpp">
</File>
<File
RelativePath="..\..\src\xrc\xh_richtext.cpp">
</File>
</Filter>
</Files>
<Globals>

18
build/msw/wx_vc8_core.vcproj
View File

@@ -8055,6 +8055,10 @@
RelativePath="..\..\include\wx\xrc\xh_radbx.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_richtext.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_scrol.h"
>
@@ -8143,6 +8147,10 @@
RelativePath="..\..\include\wx\xrc\xmlres.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xmlreshandler.h"
>
</File>
<File
RelativePath="..\..\include\wx\xpmdecod.h"
>
@@ -8152,6 +8160,16 @@
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\xrc\xmlreshandler.cpp"
>
</File>
</Filter>
</Files>
<Globals>

8
build/msw/wx_vc8_richtext.vcproj
View File

@@ -1138,6 +1138,10 @@
RelativePath="..\..\include\wx\richtext\richtextxml.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_richtext.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
@@ -1184,6 +1188,10 @@
RelativePath="..\..\src\richtext\richtextxml.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_richtext.cpp"
>
</File>
</Filter>
</Files>
<Globals>

18
build/msw/wx_vc9_core.vcproj
View File

@@ -8051,6 +8051,10 @@
RelativePath="..\..\include\wx\xrc\xh_radbx.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_richtext.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_scrol.h"
>
@@ -8139,6 +8143,10 @@
RelativePath="..\..\include\wx\xrc\xmlres.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xmlreshandler.h"
>
</File>
<File
RelativePath="..\..\include\wx\xpmdecod.h"
>
@@ -8148,6 +8156,16 @@
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\xrc\xmlreshandler.cpp"
>
</File>
</Filter>
</Files>
<Globals>

8
build/msw/wx_vc9_richtext.vcproj
View File

@@ -1134,6 +1134,10 @@
RelativePath="..\..\include\wx\richtext\richtextxml.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_richtext.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
@@ -1180,6 +1184,10 @@
RelativePath="..\..\src\richtext\richtextxml.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_richtext.cpp"
>
</File>
</Filter>
</Files>
<Globals>