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

Don't build separate webview_chromium library

Browse source 
Just include wxWebViewChromium in the webview library if it's enabled
during the build.

There doesn't seem to be any reason to build a separate library for it,
it's not really different from the other disabled by default wxWebView
backend (Edge).

And now that we don't need to link with an extra library, there is also
no need to have a separate webview_chromium sample, so just add a
possibility to run webview sample itself using Chromium backend by
setting WX_WEBVIEW_BACKEND environment variable.
This commit is contained in:
Vadim Zeitlin 2023-09-13 18:31:24 +02:00
parent 168ca9403d
commit ae8619b6dd
36 changed files with 499 additions and 1338 deletions
Download patch file Download diff file Expand all files Collapse all files

49
configure vendored
View file

@ -676,7 +676,6 @@ COND_WITH_PLUGIN_SDL_1
COND_WINDOWS_IMPLIB_1
COND_USE_XML_1
COND_USE_WEBVIEW_WEBKIT2_1
COND_USE_WEBVIEW_CHROMIUM_1
COND_USE_THREADS_1
COND_USE_THREADS_0
COND_USE_STC_1
@ -776,7 +775,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_MACOSX_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
@ -807,7 +805,6 @@ COND_MONOLITHIC_0_SHARED_1_USE_STC_1
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1
COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
@ -821,7 +818,6 @@ COND_MONOLITHIC_0_SHARED_0_USE_STC_1
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
@ -902,6 +898,7 @@ TOOLKIT_LOWERCASE
DEBUG_FLAG
DEBUG_INFO
WITH_PLUGIN_SDL
EXTRALDFLAGS_WEBVIEW
EXTRALIBS_WEBVIEW
EXTRALIBS_STC
EXTRALIBS_SDL
@ -39715,6 +39712,14 @@ $as_echo "$as_me: WARNING: wxWebView Edge backend only available under MSW, igno
fi
if test "$wxUSE_WEBVIEW_CHROMIUM" = "yes"; then
CEF_DIR="$srcdir/3rdparty/cef"
CEF_DLL_WRAPPER_DIR="$CEF_DIR/libcef_dll_wrapper"
EXTRALIBS_WEBVIEW="-L$CEF_DLL_WRAPPER_DIR -lcef_dll_wrapper $EXTRALIBS_WEBVIEW"
if test "$wxUSE_MAC" != 1; then
EXTRALDFLAGS_WEBVIEW="-L$CEF_DIR/Release -Wl,--no-as-needed -lcef -Wl,--as-needed"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CEF" >&5
$as_echo_n "checking for CEF... " >&6; }
if ${wx_cv_lib_cef+:} false; then :
@ -39729,7 +39734,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I$srcdir/3rdparty/cef $CPPFLAGS"
CPPFLAGS="-I$CEF_DIR $CPPFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "include/cef_version.h"
@ -39752,14 +39757,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$wx_cv_lib_cef" = "yes"; then
old_LIBS="$LIBS"
CEF_DIR="$srcdir/3rdparty/cef"
CEF_DLL_WRAPPER_DIR="$CEF_DIR/libcef_dll_wrapper"
if test "$wxUSE_MAC" != 1; then
CEF_LIB="-L$CEF_DIR/Release -lcef"
fi
LIBS="-L$CEF_DLL_WRAPPER_DIR -lcef_dll_wrapper $CEF_LIB $LIBS"
LIBS="$EXTRALDFLAGS_WEBVIEW $EXTRALIBS_WEBVIEW $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -39803,6 +39801,10 @@ fi
$as_echo "$wx_cv_lib_cef" >&6; }
if test "$wx_cv_lib_cef" = "yes"; then
if test "$wxUSE_MAC" = 1; then
EXTRALIBS_WEBVIEW="-F$CEF_DIR/Release -framework Chromium\ Embedded\ Framework $EXTRALIBS_WEBVIEW"
fi
wxUSE_WEBVIEW="yes"
USE_WEBVIEW_CHROMIUM=1
$as_echo "#define wxUSE_WEBVIEW_CHROMIUM 1" >>confdefs.h
@ -41022,6 +41024,7 @@ fi
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
@ -42502,11 +42505,6 @@ EOF
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1=""
fi
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1=""
fi
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
@ -42572,11 +42570,6 @@ EOF
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1=""
fi
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1=""
fi
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
@ -42727,11 +42720,6 @@ EOF
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
fi
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$SHARED" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
@ -43227,11 +43215,6 @@ EOF
COND_USE_THREADS_1=""
fi
COND_USE_WEBVIEW_CHROMIUM_1="#"
if test "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
COND_USE_WEBVIEW_CHROMIUM_1=""
fi
COND_USE_WEBVIEW_WEBKIT2_1="#"
if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then
COND_USE_WEBVIEW_WEBKIT2_1=""