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

Add USE_WEBVIEW_CHROMIUM option in bkl file to allow build/unbuild

Browse source 
webview_chromium library.
This commit is contained in:
Haojian Wu 2014-07-29 10:57:39 +08:00 • committed by Tobias Taschner
parent 0bbdcfbf81
commit 910dead2d0
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/bakefiles/config.bkl
View file

@ -234,6 +234,11 @@ Default is to use debug CRT if and only if BUILD==debug.
</description>
</option>
<option name="USE_WEBVIEW_CHROMIUM">
<values>0,1</values>
<default-value>0</default-value>
</option>
<option name="USE_MEDIA">
<values>0,1</values>
<default-value>1</default-value>
@ -517,6 +522,7 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
<set var="USE_STC">1</set>
<set var="USE_HTML">1</set>
<set var="USE_WEBVIEW">1</set>
<set var="USE_WEBVIEW_CHROMIUM">0</set>
<set var="USE_MEDIA">1</set>
<set var="USE_XRC">1</set>
<set var="USE_OPENGL">1</set>

14
build/bakefiles/multilib.bkl
View file

@ -197,10 +197,8 @@
<wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
<dll id="webviewchromiumdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
<define>wxUSE_WEBVIEW_CHROMIUM=1</define>
</if>
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0'">
<define>wxUSE_WEBVIEW_CHROMIUM=1</define>
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_WEBVIEW</define>
<sources>$(WEBVIEWCHROMIUM_SRC)</sources>
@ -216,16 +214,14 @@
</dll>
<lib id="webviewchromiumlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
<define>wxUSE_WEBVIEW_CHROMIUM=1</define>
</if>
cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0'">
<define>wxUSE_WEBVIEW_CHROMIUM=1</define>
<sources>$(WEBVIEWCHROMIUM_SRC)</sources>
<msvc-headers>$(WEBVIEWCHROMIUM_HDR)</msvc-headers>
<include>$(CEF_INCLUDE_DIR)</include>
</lib>
<wxshortcut id="wxwebviewchromium" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
<wxshortcut id="wxwebviewchromium" cond="MONOLITHIC=='0' and USE_WEBVIEW_CHROMIUM=='1'"/>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webviewchromium=webviewchromiumlib+webviewchromiumdll</set>

1
configure.in
View file

@ -7231,6 +7231,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
AC_DEFINE(wxUSE_WEBVIEW)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
if test "$wxUSE_WEBVIEW_CHROMIUM" = "yes"; then
USE_WEBVIEW_CHROMIUM=1
AC_DEFINE(wxUSE_WEBVIEW_CHROMIUM)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview_chromium"
fi