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

Build src/html/chm.cpp as part of wxMSW.

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2015-08-14 13:55:07 +02:00
parent 5420f96a9c
commit c5d29608b1
9 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/msw/makefile.bcc
View File

@@ -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