AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added .chm support for Unix (Markus Sinner)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-10-07 19:47:02 +00:00
parent d7787243db
commit c839485c8e
7 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/config.bkl
View File

@ -173,6 +173,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
<option name="TOOLCHAIN_NAME"/> <option name="TOOLCHAIN_NAME"/>
<option name="EXTRALIBS"/> <option name="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/> <option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_HTML"/>
<option name="EXTRALIBS_ODBC"/> <option name="EXTRALIBS_ODBC"/>
<option name="EXTRALIBS_GUI"/> <option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/> <option name="EXTRALIBS_OPENGL"/>
@ -210,6 +211,7 @@ it if SHARED=1 unless you know what you are doing.
<set var="EXTRACFLAGS"/> <set var="EXTRACFLAGS"/>
<set var="EXTRALIBS"/> <set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/> <set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_ODBC"/> <set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/> <set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL"> <set var="EXTRALIBS_OPENGL">

6
build/bakefiles/files.bkl
View File

@ -2044,6 +2044,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MSW'"> <if cond="TOOLKIT=='MSW'">
src/msw/helpbest.cpp src/msw/helpbest.cpp
</if> </if>
<if cond="PLATFORM_UNIX=='1'">
src/html/chm.cpp
</if>
<if cond="PLATFORM_MACOSX=='1'">
src/html/chm.cpp
</if>
</set> </set>
<set var="HTML_SRC" hints="files"> <set var="HTML_SRC" hints="files">
$(HTML_SRC_PLATFORM) $(HTML_SRC_PLATFORM)

1
build/bakefiles/monolithic.bkl
View File

@ -17,6 +17,7 @@
<define>WXMAKINGDLL</define> <define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC)</sources> <sources>$(MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs> <ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs> <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers> <msvc-headers>$(ALL_HEADERS)</msvc-headers>
</dll> </dll>

1
build/bakefiles/multilib.bkl
View File

@ -148,6 +148,7 @@
<sources>$(HTML_SRC)</sources> <sources>$(HTML_SRC)</sources>
<library>coredll</library> <library>coredll</library>
<library>basedll</library> <library>basedll</library>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<msvc-headers>$(HTML_HDR)</msvc-headers> <msvc-headers>$(HTML_HDR)</msvc-headers>
</dll> </dll>

1
build/bakefiles/wxwin.py
View File

@ -41,6 +41,7 @@ LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid']
EXTRALIBS = { EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)', 'gl' : '$(EXTRALIBS_OPENGL)',
'xml' : '$(EXTRALIBS_XML)', 'xml' : '$(EXTRALIBS_XML)',
'html' : '$(EXTRALIBS_HTML)',
'odbc' : '$(EXTRALIBS_ODBC)', 'odbc' : '$(EXTRALIBS_ODBC)',
} }

13
include/wx/chkconf.h
View File

@ -403,6 +403,19 @@
# endif # endif
#endif /* !defined(wxUSE_HTML) */ #endif /* !defined(wxUSE_HTML) */
#ifndef wxUSE_LIBMSPACK
# ifndef __UNIX__
/* set to 0 on platforms that don't have libmspack */
# define wxUSE_LIBMSPACK 0
# else
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LIBMSPACK must be defined."
# else
# define wxUSE_LIBMSPACK 0
# endif
# endif
#endif /* !defined(wxUSE_LIBMSPACK) */
#ifndef wxUSE_ICO_CUR #ifndef wxUSE_ICO_CUR
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_ICO_CUR must be defined." # error "wxUSE_ICO_CUR must be defined."

4
setup.h.in
View File

@ -784,6 +784,10 @@
* Use MS HTML Help controller (win32) * Use MS HTML Help controller (win32)
*/ */
#define wxUSE_MS_HTML_HELP 0 #define wxUSE_MS_HTML_HELP 0
/*
* Use MS HTML Help via libmspack (Unix)
*/
#define wxUSE_LIBMSPACK 0
/* /*
* Use iostream.h rather than iostream * Use iostream.h rather than iostream