diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 61d6c30de1..88c0faa723 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -234,6 +234,11 @@ Default is to use debug CRT if and only if BUILD==debug.
+
+ 0,1
+ 0
+
+
0,1
1
@@ -517,6 +522,7 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
1
1
1
+ 0
1
1
1
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index c1062d04a9..72e0d7a26b 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -197,10 +197,8 @@
-
- wxUSE_WEBVIEW_CHROMIUM=1
-
+ cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0'">
+ wxUSE_WEBVIEW_CHROMIUM=1
WXUSINGDLL
WXMAKINGDLL_WEBVIEW
$(WEBVIEWCHROMIUM_SRC)
@@ -216,16 +214,14 @@
-
- wxUSE_WEBVIEW_CHROMIUM=1
-
+ cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0'">
+ wxUSE_WEBVIEW_CHROMIUM=1
$(WEBVIEWCHROMIUM_SRC)
$(WEBVIEWCHROMIUM_HDR)
$(CEF_INCLUDE_DIR)
-
+
webview=webviewlib+webviewdll
webviewchromium=webviewchromiumlib+webviewchromiumdll
diff --git a/configure.in b/configure.in
index 03f7768cdd..fc07ca1642 100644
--- a/configure.in
+++ b/configure.in
@@ -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