fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / build / msw / makefile.vc

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 563782f3bf5895f39532498c2d9e37ec02c12555..561dba04f82405ca7aa5342eebb6e7971724fec1 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -994,6 +994,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_gdctl.obj \
        $(OBJS)\xrcdll_xh_grid.obj \
        $(OBJS)\xrcdll_xh_html.obj \
+       $(OBJS)\xrcdll_xh_hyperlink.obj \
        $(OBJS)\xrcdll_xh_listb.obj \
        $(OBJS)\xrcdll_xh_listbk.obj \
        $(OBJS)\xrcdll_xh_listc.obj \
@@ -1051,6 +1052,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_gdctl.obj \
        $(OBJS)\xrclib_xh_grid.obj \
        $(OBJS)\xrclib_xh_html.obj \
+       $(OBJS)\xrclib_xh_hyperlink.obj \
        $(OBJS)\xrclib_xh_listb.obj \
        $(OBJS)\xrclib_xh_listbk.obj \
        $(OBJS)\xrclib_xh_listc.obj \
@@ -1283,6 +1285,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_gdctl.obj \
        $(OBJS)\monodll_xh_grid.obj \
        $(OBJS)\monodll_xh_html.obj \
+       $(OBJS)\monodll_xh_hyperlink.obj \
        $(OBJS)\monodll_xh_listb.obj \
        $(OBJS)\monodll_xh_listbk.obj \
        $(OBJS)\monodll_xh_listc.obj \
@@ -1441,6 +1444,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontenumcmn.obj \
        $(OBJS)\monodll_fontmap.obj \
        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_gaugecmn.obj \
@@ -1645,6 +1649,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontenumcmn.obj \
        $(OBJS)\monodll_fontmap.obj \
        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_gaugecmn.obj \
@@ -1729,6 +1734,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_gridctrl.obj \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_hyperlink.obj \
        $(OBJS)\monodll_laywin.obj \
        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_propdlg.obj \
@@ -1757,6 +1763,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_gridctrl.obj \
        $(OBJS)\monodll_gridsel.obj \
        $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_hyperlink.obj \
        $(OBJS)\monodll_laywin.obj \
        $(OBJS)\monodll_odcombo.obj \
        $(OBJS)\monodll_propdlg.obj \
@@ -1838,6 +1845,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_gdctl.obj \
        $(OBJS)\monolib_xh_grid.obj \
        $(OBJS)\monolib_xh_html.obj \
+       $(OBJS)\monolib_xh_hyperlink.obj \
        $(OBJS)\monolib_xh_listb.obj \
        $(OBJS)\monolib_xh_listbk.obj \
        $(OBJS)\monolib_xh_listc.obj \
@@ -1996,6 +2004,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontenumcmn.obj \
        $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_gaugecmn.obj \
@@ -2200,6 +2209,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontenumcmn.obj \
        $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_gaugecmn.obj \
@@ -2284,6 +2294,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gridctrl.obj \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_hyperlink.obj \
        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
@@ -2312,6 +2323,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_gridctrl.obj \
        $(OBJS)\monolib_gridsel.obj \
        $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_hyperlink.obj \
        $(OBJS)\monolib_laywin.obj \
        $(OBJS)\monolib_odcombo.obj \
        $(OBJS)\monolib_propdlg.obj \
@@ -2508,6 +2520,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontenumcmn.obj \
        $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_gaugecmn.obj \
@@ -2712,6 +2725,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontenumcmn.obj \
        $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_gaugecmn.obj \
@@ -2925,6 +2939,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontenumcmn.obj \
        $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_gaugecmn.obj \
@@ -3129,6 +3144,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontenumcmn.obj \
        $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_gaugecmn.obj \
@@ -3223,6 +3239,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_gridctrl.obj \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_hyperlink.obj \
        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
@@ -3251,6 +3268,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_gridctrl.obj \
        $(OBJS)\advdll_gridsel.obj \
        $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_hyperlink.obj \
        $(OBJS)\advdll_laywin.obj \
        $(OBJS)\advdll_odcombo.obj \
        $(OBJS)\advdll_propdlg.obj \
@@ -3288,6 +3306,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_gridctrl.obj \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_hyperlink.obj \
        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
@@ -3316,6 +3335,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_gridctrl.obj \
        $(OBJS)\advlib_gridsel.obj \
        $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_hyperlink.obj \
        $(OBJS)\advlib_laywin.obj \
        $(OBJS)\advlib_odcombo.obj \
        $(OBJS)\advlib_propdlg.obj \
@@ -4974,6 +4994,9 @@ $(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5719,6 +5742,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6124,6 +6152,11 @@ $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6771,6 +6804,9 @@ $(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -7516,6 +7552,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7921,6 +7962,11 @@ $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -9388,6 +9434,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -10567,6 +10618,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10965,6 +11021,9 @@ $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp
 $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -11043,6 +11102,9 @@ $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp
 $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
@@ -11412,6 +11474,9 @@ $(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
+$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
 $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
@@ -11550,6 +11615,9 @@ $(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
 $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 
+$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
 $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**