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

Use combined webview sample and move CEF to 3rdparty/cef

Browse source 
VS CEF sample to single vcxproj file and into samples/webview folder
This commit is contained in:
Tobias Taschner 2018-02-19 20:46:16 +01:00
parent e4c03f6857
commit 7ce4d769fd
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
23 changed files with 470 additions and 790 deletions
Download patch file Download diff file Expand all files Collapse all files

39
configure vendored
View file

@ -670,6 +670,7 @@ COND_WITH_PLUGIN_SDL_1
COND_WINDOWS_IMPLIB_1
COND_USE_XRC_1
COND_USE_WEBVIEW_WEBKIT2_1
COND_USE_WEBVIEW_CHROMIUM_1
COND_USE_THREADS_1
COND_USE_THREADS_0
COND_USE_STC_1
@ -779,6 +780,7 @@ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_UNIX_1
COND_PLATFORM_UNIX_0
COND_PLATFORM_OS2_1
COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
COND_PLATFORM_MACOSX_1_USE_OPENGL_1
COND_PLATFORM_MACOSX_1_USE_GUI_1
@ -792,6 +794,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_MACOSX_1_SHARED_1
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_MACOSX_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
@ -803,6 +806,7 @@ COND_MONOLITHIC_1_SHARED_1
COND_MONOLITHIC_1_SHARED_0
COND_MONOLITHIC_1
COND_MONOLITHIC_0_USE_XRC_1
COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1
COND_MONOLITHIC_0_USE_WEBVIEW_1
COND_MONOLITHIC_0_USE_STC_1
COND_MONOLITHIC_0_USE_RICHTEXT_1
@ -819,6 +823,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_STC_1
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_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
@ -831,6 +836,7 @@ 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
@ -37898,7 +37904,7 @@ fi
fi
if test "$wxUSE_WEBVIEW_CHROMIUM" = "yes"; then
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I$srcdir/src/cef $CPPFLAGS"
CPPFLAGS="-I$srcdir/3rdparty/cef $CPPFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "include/cef_version.h" "ac_cv_header_include_cef_version_h" "$ac_includes_default"
if test "x$ac_cv_header_include_cef_version_h" = xyes; then :
@ -37906,7 +37912,6 @@ if test "x$ac_cv_header_include_cef_version_h" = xyes; then :
USE_WEBVIEW_CHROMIUM=1
$as_echo "#define wxUSE_WEBVIEW_CHROMIUM 1" >>confdefs.h
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview_chromium"
else
@ -40696,6 +40701,11 @@ 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=""
@ -40756,6 +40766,11 @@ 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=""
@ -40836,6 +40851,11 @@ EOF
COND_MONOLITHIC_0_USE_WEBVIEW_1=""
fi
COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1=""
fi
COND_MONOLITHIC_0_USE_XRC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then
COND_MONOLITHIC_0_USE_XRC_1=""
@ -40891,6 +40911,11 @@ EOF
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
fi
COND_PLATFORM_MACOSX_1_SHARED_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$SHARED" = "x1" ; then
COND_PLATFORM_MACOSX_1_SHARED_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
@ -40956,6 +40981,11 @@ EOF
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
fi
COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1=""
fi
COND_PLATFORM_OS2_1="#"
if test "x$PLATFORM_OS2" = "x1" ; then
COND_PLATFORM_OS2_1=""
@ -41501,6 +41531,11 @@ 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=""