From c5d29608b1a50319e1419ff7328e699da53ac39d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 14 Aug 2015 13:55:07 +0200 Subject: [PATCH] Build src/html/chm.cpp as part of wxMSW. In native MSW builds this file is not needed as wxUSE_LIBMSPACK is always 0 anyhow, but it is required when cross-compiling or using Cygwin and libmspack was detected by configure. Closes #16923. --- Makefile.in | 24 ++++++++++++++++++++---- build/bakefiles/files.bkl | 1 + build/files | 1 + build/msw/makefile.bcc | 16 ++++++++++++++++ build/msw/makefile.gcc | 16 ++++++++++++++++ build/msw/makefile.vc | 16 ++++++++++++++++ build/msw/wx_vc7_html.vcproj | 3 +++ build/msw/wx_vc8_html.vcproj | 4 ++++ build/msw/wx_vc9_html.vcproj | 4 ++++ 9 files changed, 81 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4c8c304036..5dc386c53a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6854,7 +6854,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o -@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o +@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = \ +@COND_TOOLKIT_MSW@ monodll_helpbest.o monodll_chm.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = monodll_osx_webview_webkit.o @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \ @@ -9233,7 +9234,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_unix_mediactrl.o @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o -@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o +@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = \ +@COND_TOOLKIT_MSW@ monolib_helpbest.o monolib_chm.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 \ @COND_PLATFORM_MACOSX_1@ = monolib_osx_webview_webkit.o @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \ @@ -14146,7 +14148,8 @@ COND_USE_SOVERSOLARIS_1___htmldll___so_symlinks_uninst_cmd = rm -f \ @COND_PLATFORM_WIN32_1@__htmldll___win32rc = htmldll_version_rc.o @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o -@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o +@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = \ +@COND_TOOLKIT_MSW@ htmldll_helpbest.o htmldll_chm.o COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname) @@ -14161,7 +14164,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname = \ @COND_USE_PCH_1@ = ./.pch/wxprec_htmllib/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o -@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o +@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = \ +@COND_TOOLKIT_MSW@ htmllib_helpbest.o htmllib_chm.o @COND_SHARED_1@____wxhtml_namedll_DEP = $(__htmldll___depname) @COND_SHARED_0@____wxhtml_namelib_DEP = $(__htmllib___depname) COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1___webviewdll___depname = \ @@ -23355,6 +23359,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp + @COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp @@ -29283,6 +29290,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp + @COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp @@ -40407,6 +40417,9 @@ htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp $(HTMLDLL_ODEP) htmldll_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLDLL_ODEP) $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp +@COND_TOOLKIT_MSW@htmldll_chm.o: $(srcdir)/src/html/chm.cpp $(HTMLDLL_ODEP) +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp + @COND_PLATFORM_UNIX_1@htmldll_chm.o: $(srcdir)/src/html/chm.cpp $(HTMLDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp @@ -40491,6 +40504,9 @@ htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(HTMLLIB_ODEP) htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp +@COND_TOOLKIT_MSW@htmllib_chm.o: $(srcdir)/src/html/chm.cpp $(HTMLLIB_ODEP) +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp + @COND_PLATFORM_UNIX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp $(HTMLLIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 5baee04998..0f55b0771a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3353,6 +3353,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/helpbest.cpp + src/html/chm.cpp src/html/chm.cpp diff --git a/build/files b/build/files index db44285c0b..143cd1316d 100644 --- a/build/files +++ b/build/files @@ -2841,6 +2841,7 @@ MEDIA_GTK1_SRC = HTML_MSW_SRC = src/msw/helpbest.cpp + src/html/chm.cpp HTML_CMN_SRC = src/html/helpctrl.cpp src/html/helpdata.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index aab7be56ea..bdf04b22ea 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1041,6 +1041,7 @@ HTMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ + $(OBJS)\htmldll_chm.obj \ $(OBJS)\htmldll_helpctrl.obj \ $(OBJS)\htmldll_helpdata.obj \ $(OBJS)\htmldll_helpdlg.obj \ @@ -1077,6 +1078,7 @@ HTMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ + $(OBJS)\htmllib_chm.obj \ $(OBJS)\htmllib_helpctrl.obj \ $(OBJS)\htmllib_helpdata.obj \ $(OBJS)\htmllib_helpdlg.obj \ @@ -1624,6 +1626,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_mediactrl_wmp10.obj \ $(OBJS)\monodll_mediactrl_qt.obj \ $(OBJS)\monodll_helpbest.obj \ + $(OBJS)\monodll_chm.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ $(OBJS)\monodll_helpdlg.obj \ @@ -2441,6 +2444,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_mediactrl_wmp10.obj \ $(OBJS)\monolib_mediactrl_qt.obj \ $(OBJS)\monolib_helpbest.obj \ + $(OBJS)\monolib_chm.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ $(OBJS)\monolib_helpdlg.obj \ @@ -7046,6 +7050,9 @@ $(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\monodll_chm.obj: ..\..\src\html\chm.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp @@ -9542,6 +9549,9 @@ $(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\monolib_chm.obj: ..\..\src\html\chm.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp @@ -15347,6 +15357,9 @@ $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\htmldll_chm.obj: ..\..\src\html\chm.cpp + $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp @@ -15428,6 +15441,9 @@ $(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\htmllib_chm.obj: ..\..\src\html\chm.cpp + $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index e9a450f975..72a3c195d6 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1039,6 +1039,7 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.o \ $(OBJS)\htmldll_version_rc.o \ $(OBJS)\htmldll_helpbest.o \ + $(OBJS)\htmldll_chm.o \ $(OBJS)\htmldll_helpctrl.o \ $(OBJS)\htmldll_helpdata.o \ $(OBJS)\htmldll_helpdlg.o \ @@ -1075,6 +1076,7 @@ HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.o \ $(OBJS)\htmllib_helpbest.o \ + $(OBJS)\htmllib_chm.o \ $(OBJS)\htmllib_helpctrl.o \ $(OBJS)\htmllib_helpdata.o \ $(OBJS)\htmllib_helpdlg.o \ @@ -1642,6 +1644,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_mediactrl_wmp10.o \ $(OBJS)\monodll_mediactrl_qt.o \ $(OBJS)\monodll_helpbest.o \ + $(OBJS)\monodll_chm.o \ $(OBJS)\monodll_helpctrl.o \ $(OBJS)\monodll_helpdata.o \ $(OBJS)\monodll_helpdlg.o \ @@ -2465,6 +2468,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_mediactrl_wmp10.o \ $(OBJS)\monolib_mediactrl_qt.o \ $(OBJS)\monolib_helpbest.o \ + $(OBJS)\monolib_chm.o \ $(OBJS)\monolib_helpctrl.o \ $(OBJS)\monolib_helpdata.o \ $(OBJS)\monolib_helpdlg.o \ @@ -7221,6 +7225,9 @@ $(OBJS)\monodll_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp $(OBJS)\monodll_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_chm.o: ../../src/html/chm.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_helpctrl.o: ../../src/html/helpctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9717,6 +9724,9 @@ $(OBJS)\monolib_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp $(OBJS)\monolib_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_chm.o: ../../src/html/chm.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_helpctrl.o: ../../src/html/helpctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15522,6 +15532,9 @@ $(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc $(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\htmldll_chm.o: ../../src/html/chm.cpp + $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\htmldll_helpctrl.o: ../../src/html/helpctrl.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15603,6 +15616,9 @@ $(OBJS)\htmllib_dummy.o: ../../src/common/dummy.cpp $(OBJS)\htmllib_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\htmllib_chm.o: ../../src/html/chm.cpp + $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\htmllib_helpctrl.o: ../../src/html/helpctrl.cpp $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 85e140a1fe..dd52e808a8 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1132,6 +1132,7 @@ HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ + $(OBJS)\htmldll_chm.obj \ $(OBJS)\htmldll_helpctrl.obj \ $(OBJS)\htmldll_helpdata.obj \ $(OBJS)\htmldll_helpdlg.obj \ @@ -1174,6 +1175,7 @@ HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ + $(OBJS)\htmllib_chm.obj \ $(OBJS)\htmllib_helpctrl.obj \ $(OBJS)\htmllib_helpdata.obj \ $(OBJS)\htmllib_helpdlg.obj \ @@ -1924,6 +1926,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_mediactrl_wmp10.obj \ $(OBJS)\monodll_mediactrl_qt.obj \ $(OBJS)\monodll_helpbest.obj \ + $(OBJS)\monodll_chm.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ $(OBJS)\monodll_helpdlg.obj \ @@ -2747,6 +2750,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_mediactrl_wmp10.obj \ $(OBJS)\monolib_mediactrl_qt.obj \ $(OBJS)\monolib_helpbest.obj \ + $(OBJS)\monolib_chm.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ $(OBJS)\monolib_helpdlg.obj \ @@ -7738,6 +7742,9 @@ $(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\monodll_chm.obj: ..\..\src\html\chm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp @@ -10234,6 +10241,9 @@ $(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\monolib_chm.obj: ..\..\src\html\chm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp @@ -16039,6 +16049,9 @@ $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\htmldll_chm.obj: ..\..\src\html\chm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp @@ -16120,6 +16133,9 @@ $(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp +$(OBJS)\htmllib_chm.obj: ..\..\src\html\chm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\chm.cpp + $(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj index 9a95fe89ba..1ef5abc0a8 100644 --- a/build/msw/wx_vc7_html.vcproj +++ b/build/msw/wx_vc7_html.vcproj @@ -330,6 +330,9 @@ + + diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index 422950db19..913996124e 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -852,6 +852,10 @@ Name="wxHTML Sources" UniqueIdentifier="{2F6FA2A9-E2B7-5B50-9F90-38855A21AF00}" > + + diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index da2d3ea4b6..a81c1fe278 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -848,6 +848,10 @@ Name="wxHTML Sources" UniqueIdentifier="{2F6FA2A9-E2B7-5B50-9F90-38855A21AF00}" > + +