solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

allow building wxXRC with wxUSE_HTML=0: make linking work in absence of wxHTML library

Browse source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-01-22 13:07:27 +00:00
parent 19fb58e85b
commit 47b6ebde09
6 changed files with 107 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build/bakefiles/multilib.bkl
View file

@ -176,6 +176,11 @@
<msvc-headers>$(HTML_HDR)</msvc-headers>
</dll>
<!-- use this to conditonally link against htmldll with <library>: -->
<set var="htmldll_library_link">
<if cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">htmldll</if>
</set>
<lib id="htmllib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<sources>$(HTML_SRC)</sources>
@ -247,7 +252,7 @@
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XRC</define>
<sources>$(XRC_SRC)</sources>
<library>htmldll</library>
<library>$(htmldll_library_link)</library>
<library>advdll</library>
<library>coredll</library>
<library>xmldll</library>
@ -296,7 +301,7 @@
<define>WXMAKINGDLL_RICHTEXT</define>
<sources>$(RICHTEXT_SRC)</sources>
<library>advdll</library>
<library>htmldll</library>
<library>$(htmldll_library_link)</library>
<library>xmldll</library>
<library>coredll</library>
<library>basedll</library>