Fixes for USE_GUI=0 to make pure wxBase makefiles possible. Nothing rebaked because GUI builds are not influenced (but makefiles minimally changed).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
62038e5976
commit
0bcf9597ab
2 changed files with 12 additions and 4 deletions
|
|
@ -166,7 +166,7 @@
|
|||
<!-- ================================================================ -->
|
||||
|
||||
<dll id="htmldll" template="wx_dll"
|
||||
cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
|
||||
cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_HTML</define>
|
||||
<sources>$(HTML_SRC)</sources>
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
</dll>
|
||||
|
||||
<lib id="htmllib" template="wx_lib"
|
||||
cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
|
||||
cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
|
||||
<sources>$(HTML_SRC)</sources>
|
||||
<msvc-headers>$(HTML_HDR)</msvc-headers>
|
||||
</lib>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue