From 7ce4d769fdb0a01ed1cdc3d504306336968d14b8 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Mon, 19 Feb 2018 20:46:16 +0100 Subject: [PATCH] Use combined webview sample and move CEF to 3rdparty/cef VS CEF sample to single vcxproj file and into samples/webview folder --- .gitignore | 2 +- Makefile.in | 301 +++++++++++++++--- autoconf_inc.m4 | 6 + build/bakefiles/config.bkl | 10 +- build/bakefiles/files.bkl | 7 + build/msw/wx_vc15.sln | 16 + build/msw/wx_webviewchromium.vcxproj | 12 +- configure | 39 ++- configure.in | 5 +- samples/samples.bkl | 8 - .../mac/helper-Info.plist | 0 .../mac/tools/LICENSE.CEF | 0 .../mac/tools/README-TRANSFER.txt | 0 .../mac/tools/change_mach_o_flags.py | 0 .../mac/tools/make_more_helpers.sh | 0 .../mac/webview_chromium-Info.plist | 0 samples/webview/webview.bkl | 107 +++++++ .../webview_chromium.vcxproj} | 52 +-- .../mac/process_helper_mac.cpp | 23 -- samples/webview_chromium/webview.cpp | 22 -- samples/webview_chromium/webview_chromium.bkl | 107 ------- .../webview_chromium_vc10.vcxproj | 269 ---------------- .../webview_chromium_vc11.vcxproj | 274 ---------------- 23 files changed, 470 insertions(+), 790 deletions(-) rename samples/{webview_chromium => webview}/mac/helper-Info.plist (100%) rename samples/{webview_chromium => webview}/mac/tools/LICENSE.CEF (100%) rename samples/{webview_chromium => webview}/mac/tools/README-TRANSFER.txt (100%) rename samples/{webview_chromium => webview}/mac/tools/change_mach_o_flags.py (100%) rename samples/{webview_chromium => webview}/mac/tools/make_more_helpers.sh (100%) rename samples/{webview_chromium => webview}/mac/webview_chromium-Info.plist (100%) rename samples/{webview_chromium/webview_chromium_vc12.vcxproj => webview/webview_chromium.vcxproj} (83%) delete mode 100644 samples/webview_chromium/mac/process_helper_mac.cpp delete mode 100644 samples/webview_chromium/webview.cpp delete mode 100644 samples/webview_chromium/webview_chromium.bkl delete mode 100644 samples/webview_chromium/webview_chromium_vc10.vcxproj delete mode 100644 samples/webview_chromium/webview_chromium_vc11.vcxproj diff --git a/.gitignore b/.gitignore index 152d027436..779ae83326 100644 --- a/.gitignore +++ b/.gitignore @@ -319,7 +319,7 @@ /src/*.opt /src/*.plg -/src/cef +/3rdparty/cef # /src/common/ /src/common/y_tab.c diff --git a/Makefile.in b/Makefile.in index 583620372a..fe9a7b5e4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1697,6 +1697,43 @@ WEBVIEWLIB_OBJECTS = \ webviewlib_webviewarchivehandler.o \ webviewlib_webviewfshandler.o WEBVIEWLIB_ODEP = $(_____pch_wxprec_webviewlib_wx_wxprec_h_gch___depname) +WEBVIEWCHROMIUMDLL_CXXFLAGS = $(__webviewchromiumdll_PCH_INC) \ + -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \ + $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW_CHROMIUM -I$(top_srcdir)//3rdparty/cef \ + $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) +WEBVIEWCHROMIUMDLL_OBJCXXFLAGS = $(__webviewchromiumdll_PCH_INC) \ + -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \ + $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW_CHROMIUM -I$(top_srcdir)//3rdparty/cef \ + $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) +WEBVIEWCHROMIUMDLL_OBJECTS = \ + webviewchromiumdll_common_webview_chromium.o \ + $(__WEBVIEWCHROMIUM_OSX_SHARED_SRC_OBJECTS) \ + $(__webviewchromiumdll___win32rc) +WEBVIEWCHROMIUMDLL_ODEP = \ + $(_____pch_wxprec_webviewchromiumdll_wx_wxprec_h_gch___depname) +WEBVIEWCHROMIUMLIB_CXXFLAGS = $(__webviewchromiumlib_PCH_INC) \ + -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \ + $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(top_srcdir)//3rdparty/cef $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) +WEBVIEWCHROMIUMLIB_OBJCXXFLAGS = $(__webviewchromiumlib_PCH_INC) \ + -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \ + $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(top_srcdir)//3rdparty/cef $(CPPFLAGS) $(OBJCXXFLAGS) +WEBVIEWCHROMIUMLIB_OBJECTS = \ + webviewchromiumlib_common_webview_chromium.o \ + $(__WEBVIEWCHROMIUM_OSX_SHARED_SRC_OBJECTS_1) +WEBVIEWCHROMIUMLIB_ODEP = \ + $(_____pch_wxprec_webviewchromiumlib_wx_wxprec_h_gch___depname) QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ @@ -2109,6 +2146,10 @@ LOCALE_MSW_LINGUAS = it @COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) +COND_PLATFORM_MACOSX_1_LIBCEF_FRAMEWORK = \ + -F$(top_srcdir)/3rdparty/cef/Release/ -framework Chromium\ Embedded\ \ + Framework +@COND_PLATFORM_MACOSX_1@LIBCEF_FRAMEWORK = $(COND_PLATFORM_MACOSX_1_LIBCEF_FRAMEWORK) @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 @@ -12799,6 +12840,119 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ @COND_TOOLKIT_MSW@ webviewlib_webview_ie.o @COND_SHARED_1@____wxwebview_namedll_DEP = $(__webviewdll___depname) @COND_SHARED_0@____wxwebview_namelib_DEP = $(__webviewlib___depname) +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1___webviewchromiumdll___depname \ + = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@__webviewchromiumdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1___webviewchromiumdll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@__install_webviewchromiumdll___depname \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ = \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ install_webviewchromiumdll +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@__uninstall_webviewchromiumdll___depname \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ = \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ uninstall_webviewchromiumdll +COND_PLATFORM_MACOSX_1___webviewchromiumdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__webviewchromiumdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___webviewchromiumdll___macinstnamecmd) +COND_PLATFORM_OS2_1___webviewchromiumdll___importlib = -import \ + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) +@COND_PLATFORM_OS2_1@__webviewchromiumdll___importlib = $(COND_PLATFORM_OS2_1___webviewchromiumdll___importlib) +COND_WINDOWS_IMPLIB_1___webviewchromiumdll___importlib = \ + -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) +@COND_WINDOWS_IMPLIB_1@__webviewchromiumdll___importlib = $(COND_WINDOWS_IMPLIB_1___webviewchromiumdll___importlib) +@COND_GCC_PCH_1@__webviewchromiumdll_PCH_INC = \ +@COND_GCC_PCH_1@ -I./.pch/wxprec_webviewchromiumdll +@COND_ICC_PCH_1@__webviewchromiumdll_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ +@COND_ICC_PCH_1@ ./.pch/wxprec_webviewchromiumdll/wx/wxprec.h.gch +@COND_USE_PCH_1@_____pch_wxprec_webviewchromiumdll_wx_wxprec_h_gch___depname \ +@COND_USE_PCH_1@ = ./.pch/wxprec_webviewchromiumdll/wx/wxprec.h.gch +COND_USE_SOVERLINUX_1___webviewchromiumdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_USE_SOVERLINUX_1@__webviewchromiumdll___soname_flags = $(COND_USE_SOVERLINUX_1___webviewchromiumdll___soname_flags) +COND_USE_SOVERSOLARIS_1___webviewchromiumdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__webviewchromiumdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___webviewchromiumdll___soname_flags) +COND_USE_SOTWOSYMLINKS_1___webviewchromiumdll___so_symlinks_cmd = (cd \ + $(LIBDIRNAME)/; rm -f \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)) +@COND_USE_SOTWOSYMLINKS_1@__webviewchromiumdll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___webviewchromiumdll___so_symlinks_cmd) +COND_USE_SOVERSOLARIS_1___webviewchromiumdll___so_symlinks_cmd = (cd \ + $(LIBDIRNAME)/; rm -f \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)) +@COND_USE_SOVERSOLARIS_1@__webviewchromiumdll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___webviewchromiumdll___so_symlinks_cmd) +COND_USE_SOTWOSYMLINKS_1___webviewchromiumdll___so_symlinks_inst_cmd = rm -f \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) +@COND_USE_SOTWOSYMLINKS_1@__webviewchromiumdll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___webviewchromiumdll___so_symlinks_inst_cmd) +COND_USE_SOVERSOLARIS_1___webviewchromiumdll___so_symlinks_inst_cmd = rm -f \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); +@COND_USE_SOVERSOLARIS_1@__webviewchromiumdll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___webviewchromiumdll___so_symlinks_inst_cmd) +COND_USE_SOTWOSYMLINKS_1___webviewchromiumdll___so_symlinks_uninst_cmd = rm \ + -f \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) +@COND_USE_SOTWOSYMLINKS_1@__webviewchromiumdll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___webviewchromiumdll___so_symlinks_uninst_cmd) +COND_USE_SOVERSOLARIS_1___webviewchromiumdll___so_symlinks_uninst_cmd = rm -f \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) +@COND_USE_SOVERSOLARIS_1@__webviewchromiumdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___webviewchromiumdll___so_symlinks_uninst_cmd) +@COND_PLATFORM_MACOSX_1@__WEBVIEWCHROMIUM_OSX_SHARED_SRC_OBJECTS \ +@COND_PLATFORM_MACOSX_1@ = webviewchromiumdll_osx_webview_chromium.o +@COND_PLATFORM_WIN32_1@__webviewchromiumdll___win32rc \ +@COND_PLATFORM_WIN32_1@ = webviewchromiumdll_version_rc.o +@COND_PLATFORM_MACOSX_1@__LIBCEF_WRAPPER_PATH_p = \ +@COND_PLATFORM_MACOSX_1@ -L$(top_srcdir)//3rdparty/cef/libcef_dll_wrapper/ +@COND_PLATFORM_UNIX_1@__LIBCEF_WRAPPER_PATH_p = \ +@COND_PLATFORM_UNIX_1@ -L$(top_srcdir)//3rdparty/cef/libcef_dll_wrapper/ +@COND_PLATFORM_WIN32_1@__LIBCEF_WRAPPER_PATH_p = \ +@COND_PLATFORM_WIN32_1@ -L$(top_srcdir)//3rdparty/cef/libcef_dll_wrapper/Release/ +@COND_PLATFORM_MACOSX_1@__LIBCEF_NAME_p = +@COND_PLATFORM_UNIX_1@__LIBCEF_NAME_p = -lcef +@COND_PLATFORM_WIN32_1@__LIBCEF_NAME_p = -llibcef +@COND_PLATFORM_MACOSX_1@__LIBCEF_DLL_WRAPPER_NAME_p = -lcef_dll_wrapper +@COND_PLATFORM_UNIX_1@__LIBCEF_DLL_WRAPPER_NAME_p = -lcef_dll_wrapper +@COND_PLATFORM_WIN32_1@__LIBCEF_DLL_WRAPPER_NAME_p = -llibcef_dll_wrapper +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1___webviewchromiumlib___depname \ + = \ + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@__webviewchromiumlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1___webviewchromiumlib___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@__install_webviewchromiumlib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ = \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ install_webviewchromiumlib +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@__uninstall_webviewchromiumlib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ = \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ uninstall_webviewchromiumlib +@COND_GCC_PCH_1@__webviewchromiumlib_PCH_INC = \ +@COND_GCC_PCH_1@ -I./.pch/wxprec_webviewchromiumlib +@COND_ICC_PCH_1@__webviewchromiumlib_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ +@COND_ICC_PCH_1@ ./.pch/wxprec_webviewchromiumlib/wx/wxprec.h.gch +@COND_USE_PCH_1@_____pch_wxprec_webviewchromiumlib_wx_wxprec_h_gch___depname \ +@COND_USE_PCH_1@ = ./.pch/wxprec_webviewchromiumlib/wx/wxprec.h.gch +@COND_PLATFORM_MACOSX_1@__WEBVIEWCHROMIUM_OSX_SHARED_SRC_OBJECTS_1 \ +@COND_PLATFORM_MACOSX_1@ = webviewchromiumlib_osx_webview_chromium.o +@COND_SHARED_1@____wxwebviewchromium_namedll_DEP = \ +@COND_SHARED_1@ $(__webviewchromiumdll___depname) +@COND_SHARED_0@____wxwebviewchromium_namelib_DEP = \ +@COND_SHARED_0@ $(__webviewchromiumlib___depname) COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__qadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname) @@ -14204,11 +14358,11 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_67 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_66 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_71 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_70 = --define wxDEBUG_LEVEL=0 +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_69 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_69 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_69 = --define wxNO_THREADS @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).2 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .2.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @@ -14222,20 +14376,20 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).2 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ +@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_70 \ @COND_wxUSE_LIBTIFF_builtin@ = --include-dir \ @COND_wxUSE_LIBTIFF_builtin@ $(wx_top_builddir)/src/tiff/libtiff -@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p_66 = \ +@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p_70 = \ @COND_wxUSE_LIBTIFF_builtin@ --include-dir $(top_srcdir)/src/tiff/libtiff -@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p_66 = \ +@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p_70 = \ @COND_wxUSE_LIBJPEG_builtin@ --include-dir $(top_srcdir)/src/jpeg -@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p_65 = \ +@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p_69 = \ @COND_wxUSE_LIBPNG_builtin@ --include-dir $(top_srcdir)/src/png -@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p_67 = \ +@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p_71 = \ @COND_wxUSE_ZLIB_builtin@ --include-dir $(top_srcdir)/src/zlib -@COND_wxUSE_REGEX_builtin@__INC_REGEX_p_65 = \ +@COND_wxUSE_REGEX_builtin@__INC_REGEX_p_69 = \ @COND_wxUSE_REGEX_builtin@ --include-dir $(top_srcdir)/src/regex -@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p_65 = \ +@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p_69 = \ @COND_wxUSE_EXPAT_builtin@ --include-dir $(top_srcdir)/src/expat/expat/lib @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ @@ -14270,9 +14424,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ ### Targets: ### -all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) +all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__webviewchromiumdll___depname) $(__webviewchromiumlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) -install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install +install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_webviewchromiumdll___depname) $(__install_webviewchromiumlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets @@ -14308,7 +14462,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal @echo " ------------------------------------------------------" @echo " " -uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_webviewdll___depname) $(__uninstall_webviewlib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) $(__uninstall_webkit2_ext___depname) locale_uninstall locale_msw_uninstall +uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_webviewdll___depname) $(__uninstall_webviewlib___depname) $(__uninstall_webviewchromiumdll___depname) $(__uninstall_webviewchromiumlib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) $(__uninstall_webkit2_ext___depname) locale_uninstall locale_msw_uninstall (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4) (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py) for f in setup.h $(RCDEFS_H); do \ @@ -14327,6 +14481,7 @@ install-strip: install $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -14381,6 +14536,10 @@ clean: $(__clean_wxrc___depname) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -14803,6 +14962,43 @@ distclean: clean @COND_MONOLITHIC_0_USE_WEBVIEW_1@wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWCHROMIUMDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) $(__webviewdll___depname) $(__webviewchromiumdll___win32rc) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(SHARED_LD_CXX) $@ $(WEBVIEWCHROMIUMDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__webviewchromiumdll___macinstnamecmd) $(__webviewchromiumdll___importlib) $(__webviewchromiumdll___soname_flags) $(WXMACVERSION_CMD) -L$(top_srcdir)//3rdparty/cef/Release/ $(__LIBCEF_WRAPPER_PATH_p) $(LIBCEF_FRAMEWORK) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX) $(__LIBCEF_NAME_p) $(__LIBCEF_DLL_WRAPPER_NAME_p) $(LIBS) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(DYLIB_RPATH_POSTLINK) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(__webviewchromiumdll___so_symlinks_cmd) + +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@install_webviewchromiumdll: $(__webviewchromiumdll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ (cd $(DESTDIR)$(libdir) ; $(__webviewchromiumdll___so_symlinks_inst_cmd)) + +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@uninstall_webviewchromiumdll: +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ (cd $(DESTDIR)$(libdir) ; $(__webviewchromiumdll___so_symlinks_uninst_cmd)) + +@COND_USE_PCH_1@./.pch/wxprec_webviewchromiumdll/wx/wxprec.h.gch: +@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_webviewchromiumdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(WEBVIEWCHROMIUMDLL_CXXFLAGS) + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WEBVIEWCHROMIUMLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ rm -f $@ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(AR) $(AROPTIONS) $@ $(WEBVIEWCHROMIUMLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(RANLIB) $@ + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@install_webviewchromiumlib: $(__webviewchromiumlib___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir) + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@uninstall_webviewchromiumlib: +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) + +@COND_USE_PCH_1@./.pch/wxprec_webviewchromiumlib/wx/wxprec.h.gch: +@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_webviewchromiumlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(WEBVIEWCHROMIUMLIB_CXXFLAGS) + +@COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1@wxwebviewchromium: $(____wxwebviewchromium_namedll_DEP) $(____wxwebviewchromium_namelib_DEP) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__qadll___win32rc) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(DYLIB_RPATH_POSTLINK) @@ -21263,7 +21459,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL $(__webviewdll_ext_dir_define_p_0) + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL $(__webviewdll_ext_dir_define_p_0) monolib_any.o: $(srcdir)/src/common/any.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/any.cpp @@ -26522,7 +26718,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 basedll_any.o: $(srcdir)/src/common/any.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/any.cpp @@ -27479,7 +27675,7 @@ baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -27584,7 +27780,7 @@ netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -35081,7 +35277,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_ADV + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_ADV advdll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp @@ -36110,7 +36306,7 @@ advlib_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/activityindicator.cpp mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp @@ -36197,7 +36393,7 @@ medialib_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MEDIALIB_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_HTML + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_HTML htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp @@ -36374,7 +36570,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp webviewdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW $(__webviewdll_ext_dir_define_p_0) + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW $(__webviewdll_ext_dir_define_p_0) webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP) $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp @@ -36418,8 +36614,23 @@ webviewlib_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.c webviewlib_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(WEBVIEWLIB_ODEP) $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp +webviewchromiumdll_common_webview_chromium.o: $(srcdir)/src/common/webview_chromium.cpp $(WEBVIEWCHROMIUMDLL_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWCHROMIUMDLL_CXXFLAGS) $(srcdir)/src/common/webview_chromium.cpp + +webviewchromiumdll_osx_webview_chromium.o: $(srcdir)/src/osx/webview_chromium.mm $(WEBVIEWCHROMIUMDLL_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWCHROMIUMDLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_chromium.mm + +webviewchromiumdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWCHROMIUMDLL_ODEP) + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW_CHROMIUM --include-dir $(top_srcdir)//3rdparty/cef + +webviewchromiumlib_common_webview_chromium.o: $(srcdir)/src/common/webview_chromium.cpp $(WEBVIEWCHROMIUMLIB_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWCHROMIUMLIB_CXXFLAGS) $(srcdir)/src/common/webview_chromium.cpp + +webviewchromiumlib_osx_webview_chromium.o: $(srcdir)/src/osx/webview_chromium.mm $(WEBVIEWCHROMIUMLIB_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWCHROMIUMLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_chromium.mm + qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_QA + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_QA qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp @@ -36434,7 +36645,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP) $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp @@ -36449,7 +36660,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP) $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_XRC + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_XRC xrcdll_xh_activityindicator.o: $(srcdir)/src/xrc/xh_activityindicator.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_activityindicator.cpp @@ -36854,7 +37065,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_AUI + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_AUI auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP) $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp @@ -36929,7 +37140,7 @@ auilib_barartmsw.o: $(srcdir)/src/aui/barartmsw.cpp $(AUILIB_ODEP) $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/barartmsw.cpp ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON ribbondll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONDLL_ODEP) $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp @@ -36998,7 +37209,7 @@ ribbonlib_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(RIBBONLIB_ODEP) $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID propgriddll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDDLL_ODEP) $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp @@ -37049,7 +37260,7 @@ propgridlib_props.o: $(srcdir)/src/propgrid/props.cpp $(PROPGRIDLIB_ODEP) $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT richtextdll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTDLL_ODEP) $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp @@ -37118,7 +37329,7 @@ richtextlib_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(RICHTEXTLIB_ODEP) $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP) $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp @@ -37139,7 +37350,7 @@ stclib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCLIB_ODEP) $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_GL + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_70) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_70) $(__INC_TIFF_p_70) $(__INC_JPEG_p_70) $(__INC_PNG_p_69) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define WXUSINGDLL --define WXMAKINGDLL_GL gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP) $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp @@ -38152,15 +38363,17 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI uninstall_mediadll install_medialib uninstall_medialib wxmedia \ install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml \ install_webviewdll uninstall_webviewdll install_webviewlib \ - uninstall_webviewlib wxwebview install_qadll uninstall_qadll install_qalib \ - uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib \ - uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib \ - uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib \ - uninstall_auilib wxaui install_ribbondll uninstall_ribbondll \ - install_ribbonlib uninstall_ribbonlib wxribbon install_propgriddll \ - uninstall_propgriddll install_propgridlib uninstall_propgridlib wxpropgrid \ - install_richtextdll uninstall_richtextdll install_richtextlib \ - uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll \ - install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll \ - install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl \ - install_webkit2_ext uninstall_webkit2_ext samples + uninstall_webviewlib wxwebview install_webviewchromiumdll \ + uninstall_webviewchromiumdll install_webviewchromiumlib \ + uninstall_webviewchromiumlib wxwebviewchromium install_qadll \ + uninstall_qadll install_qalib uninstall_qalib wxqa install_xmldll \ + uninstall_xmldll install_xmllib uninstall_xmllib wxxml install_xrcdll \ + uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc install_auidll \ + uninstall_auidll install_auilib uninstall_auilib wxaui install_ribbondll \ + uninstall_ribbondll install_ribbonlib uninstall_ribbonlib wxribbon \ + install_propgriddll uninstall_propgriddll install_propgridlib \ + uninstall_propgridlib wxpropgrid install_richtextdll uninstall_richtextdll \ + install_richtextlib uninstall_richtextlib wxrichtext install_stcdll \ + uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll \ + uninstall_gldll install_gllib uninstall_gllib wxgl install_sound_sdl \ + uninstall_sound_sdl install_webkit2_ext uninstall_webkit2_ext samples diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 98d7d98136..d57901ff9c 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -290,6 +290,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.b COND_MONOLITHIC_0_USE_WEBVIEW_1="" fi AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_1) +dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1[../../samples/caret/caret.bkl,../../samples/dragimag/dragimag.bkl,../../samples/regtest/regtest.bkl] ### + 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 + AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1) dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ### COND_MONOLITHIC_0_USE_XRC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl index 0dcb3c3ddd..fcab8cd44f 100644 --- a/build/bakefiles/config.bkl +++ b/build/bakefiles/config.bkl @@ -553,7 +553,7 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build. - $(TOP_SRCDIR)/src/cef + $(TOP_SRCDIR)/3rdparty/cef @@ -564,13 +564,13 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build. - $(CEF_INCLUDE_DIR)/out/Release/lib/ + $(CEF_INCLUDE_DIR)/libcef_dll_wrapper/Release/ - $(CEF_INCLUDE_DIR)/xcodebuild/Debug/ + $(CEF_INCLUDE_DIR)/libcef_dll_wrapper/ - $(CEF_INCLUDE_DIR)/out/Release/obj.target/ + $(CEF_INCLUDE_DIR)/libcef_dll_wrapper/ @@ -601,7 +601,7 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build. - -F$(TOP_SRCDIR)src/cef/Release/ -framework Chromium\ Embedded\ Framework + -F$(TOP_SRCDIR)3rdparty/cef/Release/ -framework Chromium\ Embedded\ Framework diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 9333fda623..089760d2e8 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3145,8 +3145,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/webview_webkit2_extension.cpp + + + src/osx/webview_chromium.mm + + + src/common/webview_chromium.cpp + $(WEBVIEWCHROMIUM_OSX_SHARED_SRC) wx/webview.h diff --git a/build/msw/wx_vc15.sln b/build/msw/wx_vc15.sln index 275a3629d7..43b2b2da0d 100644 --- a/build/msw/wx_vc15.sln +++ b/build/msw/wx_vc15.sln @@ -370,6 +370,22 @@ Global {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Debug|Win32.ActiveCfg = Debug|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Debug|Win32.Build.0 = Debug|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Debug|x64.ActiveCfg = Debug|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Debug|x64.Build.0 = Debug|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.DLL Release|x64.Build.0 = DLL Release|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Release|Win32.ActiveCfg = Release|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Release|Win32.Build.0 = Release|Win32 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Release|x64.ActiveCfg = Release|x64 + {BA6DA15A-B722-4296-9E8A-3900B933E57D}.Release|x64.Build.0 = Release|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/msw/wx_webviewchromium.vcxproj b/build/msw/wx_webviewchromium.vcxproj index 182c120e05..9b3037fb3f 100644 --- a/build/msw/wx_webviewchromium.vcxproj +++ b/build/msw/wx_webviewchromium.vcxproj @@ -138,7 +138,7 @@ Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\cef;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\3rdparty\cef;%(AdditionalIncludeDirectories) WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -210,7 +210,7 @@ /MP %(AdditionalOptions) MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\cef;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\3rdparty\cef;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -285,7 +285,7 @@ /MP %(AdditionalOptions) Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\cef;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\3rdparty\cef;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW_CHROMIUM;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -309,7 +309,7 @@ wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxToolkitLibNamePrefix)webview.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies) $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib true - $(OutDir);..\..\src\cef\Debug\;..\..\src\cef\Debug\lib;..\..\src\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) + $(OutDir);..\..\3rdparty\cef\Debug\;..\..\3rdparty\cef\Debug\lib;..\..\3rdparty\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) true MachineX86 @@ -366,7 +366,7 @@ /MP %(AdditionalOptions) MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\cef;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\3rdparty\cef;%(AdditionalIncludeDirectories) WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW_CHROMIUM;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -391,7 +391,7 @@ wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxToolkitLibNamePrefix)webview.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies) $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib true - $(OutDir);..\..\src\cef\Release\;..\..\src\cef\out\Release\lib\;%(AdditionalLibraryDirectories) + $(OutDir);..\..\3rdparty\cef\Release\;..\..\3rdparty\cef\out\Release\lib\;%(AdditionalLibraryDirectories) false MachineX86 true diff --git a/configure b/configure index 36a364acb0..0916a20ca1 100755 --- a/configure +++ b/configure @@ -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="" diff --git a/configure.in b/configure.in index 0a86be49ed..ac745a71e1 100644 --- a/configure.in +++ b/configure.in @@ -7220,15 +7220,14 @@ if test "$wxUSE_WEBVIEW" = "yes"; then wxUSE_WEBVIEW_IE="no" fi if test "$wxUSE_WEBVIEW_CHROMIUM" = "yes"; then - dnl Search for the Chromium headers in src/cef + dnl Search for the Chromium headers in 3rdparty/cef old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-I$srcdir/src/cef $CPPFLAGS" + CPPFLAGS="-I$srcdir/3rdparty/cef $CPPFLAGS" AC_CHECK_HEADER([include/cef_version.h], [ FOUND_WEBVIEW_BACKEND=1 USE_WEBVIEW_CHROMIUM=1 AC_DEFINE(wxUSE_WEBVIEW_CHROMIUM) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview_chromium" ], [ wxUSE_WEBVIEW_CHROMIUM="no" diff --git a/samples/samples.bkl b/samples/samples.bkl index 2121379201..3d415c22c1 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -107,12 +107,4 @@ - - - - - diff --git a/samples/webview_chromium/mac/helper-Info.plist b/samples/webview/mac/helper-Info.plist similarity index 100% rename from samples/webview_chromium/mac/helper-Info.plist rename to samples/webview/mac/helper-Info.plist diff --git a/samples/webview_chromium/mac/tools/LICENSE.CEF b/samples/webview/mac/tools/LICENSE.CEF similarity index 100% rename from samples/webview_chromium/mac/tools/LICENSE.CEF rename to samples/webview/mac/tools/LICENSE.CEF diff --git a/samples/webview_chromium/mac/tools/README-TRANSFER.txt b/samples/webview/mac/tools/README-TRANSFER.txt similarity index 100% rename from samples/webview_chromium/mac/tools/README-TRANSFER.txt rename to samples/webview/mac/tools/README-TRANSFER.txt diff --git a/samples/webview_chromium/mac/tools/change_mach_o_flags.py b/samples/webview/mac/tools/change_mach_o_flags.py similarity index 100% rename from samples/webview_chromium/mac/tools/change_mach_o_flags.py rename to samples/webview/mac/tools/change_mach_o_flags.py diff --git a/samples/webview_chromium/mac/tools/make_more_helpers.sh b/samples/webview/mac/tools/make_more_helpers.sh similarity index 100% rename from samples/webview_chromium/mac/tools/make_more_helpers.sh rename to samples/webview/mac/tools/make_more_helpers.sh diff --git a/samples/webview_chromium/mac/webview_chromium-Info.plist b/samples/webview/mac/webview_chromium-Info.plist similarity index 100% rename from samples/webview_chromium/mac/webview_chromium-Info.plist rename to samples/webview/mac/webview_chromium-Info.plist diff --git a/samples/webview/webview.bkl b/samples/webview/webview.bkl index 2bae6b617d..43006fd429 100644 --- a/samples/webview/webview.bkl +++ b/samples/webview/webview.bkl @@ -19,4 +19,111 @@ + + + cef_process_helper.cpp + + + $(LIBCEF_PATH) + $(LIBCEF_WRAPPER_PATH) + $(CEF_INCLUDE_DIR) + $(LIBCEF_NAME) + $(LIBCEF_DLL_WRAPPER_NAME) + $(LIBCEF_FRAMEWORK) + + + all + + + mkdir -p webview_chromium_helper.app + mkdir -p webview_chromium_helper.app/Contents/MacOS + mkdir -p webview_chromium_helper.app/Contents/Resources + sed -e "s/\$${PRODUCT_NAME}/webview_chromium Helper/" \ + -e "s/\$${EXECUTABLE_NAME}/webview_chromium Helper/" \ + $(TOP_SRCDIR)/samples/webview/mac/helper-Info.plist >webview_chromium_helper.app/Contents/Info.plist + /bin/echo "APPL????" >webview_chromium_helper.app/Contents/PkgInfo + + install_name_tool -change "@executable_path/Chromium Embedded Framework" \ + "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ + webview_chromium_helper + cp -f webview_chromium_helper webview_chromium_helper.app/Contents/MacOS/webview_chromium\ Helper + cp -f $(TOP_SRCDIR)/src/osx/carbon/wxmac.icns webview_chromium_helper.app/Contents/Resources/wxmac.icns + + + + rm -rf $(id).app + + + + + + + webview.cpp + + wxWEBVIEW_SAMPLE_CHROMIUM + webviewchromium + webview + stc + adv + core + base + $(LIBCEF_FRAMEWORK) + -Wl,-rpath,. + + $(LIBCEF_PATH) + $(LIBCEF_WRAPPER_PATH) + $(CEF_INCLUDE_DIR) + $(LIBCEF_NAME) + $(LIBCEF_DLL_WRAPPER_NAME) + + ../sample.rc + + + webview_chromium_helper + all + + mkdir -p webview_chromium.app/Contents/Frameworks/ + mkdir -p webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app + cp -Rf $(LIBCEF_PATH)/Chromium\ Embedded\ Framework.framework webview_chromium.app/Contents/Frameworks/ + + + install_name_tool -change "@executable_path/Chromium Embedded Framework" \ + "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ + webview_chromium.app/Contents/MacOS/webview_chromium + + + cp -Rf webview_chromium_helper.app/ webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app/ + $(TOP_SRCDIR)/samples/webview/mac/tools/make_more_helpers.sh $(wx_top_builddir)/samples/webview/webview_chromium.app/Contents/Frameworks \ + webview_chromium + + + + + + package + all + $(DLLPREFIX)$(wxwin.mkDllName("webview")).dylib + $(DLLPREFIX)$(wxwin.mkDllName("webviewchromium")).dylib + + cp $(wx_top_builddir)/lib/$(webviewdll) webview_chromium.app/Contents/Frameworks/ + cp $(wx_top_builddir)/lib/$(webviewchromiumdll) webview_chromium.app/Contents/Frameworks/ + install_name_tool -change "@executable_path/Chromium Embedded Framework" \ + "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ + $(wx_top_builddir)/lib/$(webviewchromiumdll) + + > + + + $(LIB_SCINTILLA) + + + diff --git a/samples/webview_chromium/webview_chromium_vc12.vcxproj b/samples/webview/webview_chromium.vcxproj similarity index 83% rename from samples/webview_chromium/webview_chromium_vc12.vcxproj rename to samples/webview/webview_chromium.vcxproj index c0a65984e2..6ae86820d5 100644 --- a/samples/webview_chromium/webview_chromium_vc12.vcxproj +++ b/samples/webview/webview_chromium.vcxproj @@ -23,29 +23,26 @@ {7688215B-1082-5681-9D37-E950D6210117} + Application false Unicode - v120 Application false Unicode - v120 Application false Unicode - v120 Application false Unicode - v120 @@ -97,13 +94,13 @@ WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) + wxWEBVIEW_SAMPLE_CHROMIUM;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebugDLL @@ -118,14 +115,14 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) 0x0409 - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxmsw31ud_webview.lib;wxmsw31ud_webviewchromium.lib;wxmsw31ud_stc.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintillad.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) + wxmsw31ud_webviewchromium.lib;wxmsw31ud_webview.lib;wxmsw31ud_stc.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintillad.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) vc_mswud\webview_chromium.exe true - .\..\..\lib\vc_lib;.\..\..\src\cef\Debug\;.\..\..\src\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) + .\..\..\lib\vc_lib;.\..\..\3rdparty\cef\Debug\;.\..\..\3rdparty\cef\libcef_dll_wrapper\Debug\;%(AdditionalLibraryDirectories) true vc_mswud\webview_chromium.pdb Windows @@ -135,17 +132,20 @@ vc_mswud\webview_chromium_vc9.bsc true + + compatibility.manifest + WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) + .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) + wxWEBVIEW_SAMPLE_CHROMIUM;WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) Sync MultiThreadedDLL true @@ -158,13 +158,13 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) 0x0409 - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) wxmsw31u_webviewchromium.lib;wxmsw31u_webview.lib;wxmsw31u_stc.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintilla.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) vc_mswu\webview_chromium.exe true - .\..\..\lib\vc_lib;.\..\..\src\cef\Release\;.\..\..\src\cef\out\Release\lib\;%(AdditionalLibraryDirectories) + .\..\..\lib\vc_lib;.\..\..\3rdparty\cef\Release\;.\..\..\3rdparty\cef\libcef_dll_wrapper\Release\;%(AdditionalLibraryDirectories) true vc_mswu\webview_chromium.pdb Windows @@ -180,13 +180,13 @@ WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) + wxWEBVIEW_SAMPLE_CHROMIUM;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebugDLL @@ -201,14 +201,14 @@ _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) 0x0409 - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) %(AdditionalOptions) wxmsw31ud_webview.lib;wxmsw31ud_webviewchromium.lib;wxmsw31ud_stc.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintillad.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) vc_mswuddll\webview_chromium.exe true - .\..\..\lib\vc_dll;.\..\..\src\cef\Debug\;.\..\..\src\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) + .\..\..\lib\vc_dll;.\..\..\3rdparty\cef\Debug\;.\..\..\3rdparty\cef\libcef_dll_wrapper\Debug\;%(AdditionalLibraryDirectories) true vc_mswuddll\webview_chromium.pdb Windows @@ -222,13 +222,13 @@ WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MaxSpeed - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) + .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) + wxWEBVIEW_SAMPLE_CHROMIUM;WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) Sync MultiThreadedDLL true @@ -241,14 +241,14 @@ _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) 0x0409 - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) + .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\3rdparty\cef;%(AdditionalIncludeDirectories) %(AdditionalOptions) wxmsw31u_webviewchromium.lib;wxmsw31u_webview.lib;wxmsw31u_stc.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintilla.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) vc_mswudll\webview_chromium.exe true - .\..\..\lib\vc_dll;.\..\..\src\cef\Release\;.\..\..\src\cef\out\Release\lib\;%(AdditionalLibraryDirectories) + .\..\..\lib\vc_dll;.\..\..\3rdparty\cef\Release\;.\..\..\3rdparty\cef\libcef_dll_wrapper\Release\;%(AdditionalLibraryDirectories) true vc_mswudll\webview_chromium.pdb Windows @@ -270,4 +270,4 @@ - + \ No newline at end of file diff --git a/samples/webview_chromium/mac/process_helper_mac.cpp b/samples/webview_chromium/mac/process_helper_mac.cpp deleted file mode 100644 index a3876d14d8..0000000000 --- a/samples/webview_chromium/mac/process_helper_mac.cpp +++ /dev/null @@ -1,23 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: samples/webview_chromium/mac/process_helper_mac.cpp -// Purpose: webview_chromium launch helper -// Author: Haojian Wu -// Created: 2014-06-22 -// Copyright: (c) 2014 - 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "include/cef_app.h" -#include "include/cef_version.h" - -// Process entry point. -int main(int argc, char* argv[]) { - CefMainArgs main_args(argc, argv); - - // Execute the secondary process. -#if CHROME_VERSION_BUILD >= 1750 - return CefExecuteProcess(main_args, NULL, NULL); -#else - return CefExecuteProcess(main_args, NULL); -#endif -} diff --git a/samples/webview_chromium/webview.cpp b/samples/webview_chromium/webview.cpp deleted file mode 100644 index c88ccfd8c7..0000000000 --- a/samples/webview_chromium/webview.cpp +++ /dev/null @@ -1,22 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: webview.cpp -// Purpose: wxWebViewChromium sample proxy -// Author: Tobias Taschner -// Copyright: (c) 2018 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - The chromium sample is identical to the webview sample but needs different - libraries to be linked and uses a different project/build files -*/ - -#include "wx/wx.h" - -#if !wxUSE_WEBVIEW_CHROMIUM -#error "A wxWebView Chromium backend is required by this sample" -#endif - -// Include the default webview sample -#define wxWEBVIEW_SAMPLE_CHROMIUM -#include "../webview/webview.cpp" diff --git a/samples/webview_chromium/webview_chromium.bkl b/samples/webview_chromium/webview_chromium.bkl deleted file mode 100644 index d9997a79ce..0000000000 --- a/samples/webview_chromium/webview_chromium.bkl +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - mac/process_helper_mac.cpp - - - $(LIBCEF_PATH) - $(LIBCEF_WRAPPER_PATH) - $(CEF_INCLUDE_DIR) - $(LIBCEF_NAME) - $(LIBCEF_DLL_WRAPPER_NAME) - $(LIBCEF_FRAMEWORK) - - - all - - - mkdir -p webview_chromium_helper.app - mkdir -p webview_chromium_helper.app/Contents/MacOS - mkdir -p webview_chromium_helper.app/Contents/Resources - sed -e "s/\$${PRODUCT_NAME}/webview_chromium Helper/" \ - -e "s/\$${EXECUTABLE_NAME}/webview_chromium Helper/" \ - mac/helper-Info.plist >webview_chromium_helper.app/Contents/Info.plist - /bin/echo "APPL????" >webview_chromium_helper.app/Contents/PkgInfo - - install_name_tool -change "@executable_path/Chromium Embedded Framework" \ - "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ - webview_chromium_helper - cp -f webview_chromium_helper webview_chromium_helper.app/Contents/MacOS/webview_chromium\ Helper - cp -f ../../src/osx/carbon/wxmac.icns webview_chromium_helper.app/Contents/Resources/wxmac.icns - - - - rm -rf $(id).app - - - - - - webview.cpp - - webview_chromium - webview - stc - adv - core - base - $(LIBCEF_FRAMEWORK) - -Wl,-rpath,. - - $(LIBCEF_PATH) - $(LIBCEF_WRAPPER_PATH) - $(CEF_INCLUDE_DIR) - $(LIBCEF_NAME) - $(LIBCEF_DLL_WRAPPER_NAME) - - ../sample.rc - - - webview_chromium_helper - all - - mkdir webview_chromium.app/Contents/Frameworks/ - mkdir webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app - cp -Rf $(LIBCEF_PATH)/Chromium\ Embedded\ Framework.framework webview_chromium.app/Contents/Frameworks/ - - - install_name_tool -change "@executable_path/Chromium Embedded Framework" \ - "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ - webview_chromium.app/Contents/MacOS/webview_chromium - - - cp -Rf webview_chromium_helper.app/ webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app/ - ./mac/tools/make_more_helpers.sh $(wx_top_builddir)/samples/webview_chromium/webview_chromium.app/Contents/Frameworks \ - webview_chromium - - - - - - package - all - $(DLLPREFIX)$(wxwin.mkDllName("webview")).dylib - $(DLLPREFIX)$(wxwin.mkDllName("webviewchromium")).dylib - - cp $(TOP_SRCDIR)lib/$(webviewdll) webview_chromium.app/Contents/Frameworks/ - cp $(TOP_SRCDIR)lib/$(webviewchromiumdll) webview_chromium.app/Contents/Frameworks/ - install_name_tool -change "@executable_path/Chromium Embedded Framework" \ - "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ - $(TOP_SRCDIR)lib/$(webviewchromiumdll) - - > - - - $(LIB_SCINTILLA) - - - - diff --git a/samples/webview_chromium/webview_chromium_vc10.vcxproj b/samples/webview_chromium/webview_chromium_vc10.vcxproj deleted file mode 100644 index ebe79cfdb1..0000000000 --- a/samples/webview_chromium/webview_chromium_vc10.vcxproj +++ /dev/null @@ -1,269 +0,0 @@ - - - - - Debug - Win32 - - - DLL Debug - Win32 - - - DLL Release - Win32 - - - Release - Win32 - - - - webview_chromium - {7688215B-1082-5681-9D37-E950D6210117} - - - - Application - false - Unicode - - - Application - false - Unicode - - - Application - false - Unicode - - - Application - false - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - vc_mswud\ - vc_mswud\webview_chromium\ - true - true - vc_mswu\ - vc_mswu\webview_chromium\ - false - true - vc_mswuddll\ - vc_mswuddll\webview_chromium\ - true - true - vc_mswudll\ - vc_mswudll\webview_chromium\ - false - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswud\webview_chromium\ - vc_mswud\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxmsw31ud_webview.lib;wxmsw31ud_stc.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintillad.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswud\webview_chromium.exe - true - .\..\..\lib\vc_lib;.\..\..\cef\Debug\;.\..\..\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) - true - vc_mswud\webview_chromium.pdb - Windows - MachineX86 - - - vc_mswud\webview_chromium_vc9.bsc - true - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswu\webview_chromium\ - vc_mswu\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - wxmsw31u_webviewchromium.lib;wxmsw31u_webview.lib;wxmsw31u_stc.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintilla.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswu\webview_chromium.exe - true - .\..\..\lib\vc_lib;.\..\..\src\cef\Release\;.\..\..\src\cef\out\Release\lib\;%(AdditionalLibraryDirectories) - true - vc_mswu\webview_chromium.pdb - Windows - MachineX86 - true - true - - - vc_mswu\webview_chromium_vc9.bsc - true - - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswuddll\webview_chromium\ - vc_mswuddll\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxmsw31ud_webview.lib;wxmsw31ud_webviewchromium.lib;wxmsw31ud_stc.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintillad.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswuddll\webview_chromium.exe - true - .\..\..\lib\vc_dll;.\..\..\src\cef\Debug\;.\..\..\src\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) - true - vc_mswuddll\webview_chromium.pdb - Windows - MachineX86 - - - vc_mswuddll\webview_chromium_vc9.bsc - true - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswudll\webview_chromium\ - vc_mswudll\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxmsw31u_webviewchromium.lib;wxmsw31u_webview.lib;wxmsw31u_stc.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintilla.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswudll\webview_chromium.exe - true - .\..\..\lib\vc_dll;.\..\..\src\cef\Release\;.\..\..\src\cef\out\Release\lib\;%(AdditionalLibraryDirectories) - true - vc_mswudll\webview_chromium.pdb - Windows - MachineX86 - true - true - - - vc_mswudll\webview_chromium_vc9.bsc - true - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/webview_chromium/webview_chromium_vc11.vcxproj b/samples/webview_chromium/webview_chromium_vc11.vcxproj deleted file mode 100644 index 9810ae6221..0000000000 --- a/samples/webview_chromium/webview_chromium_vc11.vcxproj +++ /dev/null @@ -1,274 +0,0 @@ - - - - - Debug - Win32 - - - DLL Debug - Win32 - - - DLL Release - Win32 - - - Release - Win32 - - - - webview_chromium - {7688215B-1082-5681-9D37-E950D6210117} - - - - Application - false - Unicode - v110 - - - Application - false - Unicode - v110 - - - Application - false - Unicode - v110 - - - Application - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - vc_mswud\ - vc_mswud\webview_chromium\ - true - true - vc_mswu\ - vc_mswu\webview_chromium\ - false - true - vc_mswuddll\ - vc_mswuddll\webview_chromium\ - true - true - vc_mswudll\ - vc_mswudll\webview_chromium\ - false - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswud\webview_chromium\ - vc_mswud\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxmsw31ud_webview.lib;wxmsw31ud_webviewchromium.lib;wxmsw31ud_stc.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintillad.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswud\webview_chromium.exe - true - .\..\..\lib\vc_lib;.\..\..\src\cef\Debug\;.\..\..\src\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) - true - vc_mswud\webview_chromium.pdb - Windows - MachineX86 - - - vc_mswud\webview_chromium_vc9.bsc - true - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswu\webview_chromium\ - vc_mswu\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - wxmsw31u_webviewchromium.lib;wxmsw31u_webview.lib;wxmsw31u_stc.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintilla.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswu\webview_chromium.exe - true - .\..\..\lib\vc_lib;.\..\..\src\cef\Release\;.\..\..\src\cef\out\Release\lib\;%(AdditionalLibraryDirectories) - true - vc_mswu\webview_chromium.pdb - Windows - MachineX86 - true - true - - - vc_mswu\webview_chromium_vc9.bsc - true - - - - - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswuddll\webview_chromium\ - vc_mswuddll\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxmsw31ud_webview.lib;wxmsw31ud_webviewchromium.lib;wxmsw31ud_stc.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintillad.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswuddll\webview_chromium.exe - true - .\..\..\lib\vc_dll;.\..\..\src\cef\Debug\;.\..\..\src\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) - true - vc_mswuddll\webview_chromium.pdb - Windows - MachineX86 - - - vc_mswuddll\webview_chromium_vc9.bsc - true - - - - - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;wxUSE_WEBVIEW_CHROMIUM=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswudll\webview_chromium\ - vc_mswudll\webview_chromium.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions) - 0x0409 - .\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;.\..\..\src\cef;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxmsw31u_webviewchromium.lib;wxmsw31u_webview.lib;wxmsw31u_stc.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u.lib;libcef.lib;libcef_dll_wrapper.lib;wxscintilla.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - vc_mswudll\webview_chromium.exe - true - .\..\..\lib\vc_dll;.\..\..\src\cef\Release\;.\..\..\src\cef\out\Release\lib\;%(AdditionalLibraryDirectories) - true - vc_mswudll\webview_chromium.pdb - Windows - MachineX86 - true - true - - - vc_mswudll\webview_chromium_vc9.bsc - true - - - - - - - - - - - - -