From ae8619b6dd3f95005675157c552a0aa49bb5f352 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 13 Sep 2023 18:31:24 +0200 Subject: [PATCH] Don't build separate webview_chromium library Just include wxWebViewChromium in the webview library if it's enabled during the build. There doesn't seem to be any reason to build a separate library for it, it's not really different from the other disabled by default wxWebView backend (Edge). And now that we don't need to link with an extra library, there is also no need to have a separate webview_chromium sample, so just add a possibility to run webview sample itself using Chromium backend by setting WX_WEBVIEW_BACKEND environment variable. --- Makefile.in | 378 ++++--------- autoconf_inc.m4 | 20 +- build/bakefiles/common.bkl | 6 +- build/bakefiles/config.bkl | 52 +- build/bakefiles/files.bkl | 22 +- build/bakefiles/monolithic.bkl | 1 + build/bakefiles/multilib.bkl | 27 +- build/bakefiles/wxpresets/presets/wx.bkl | 3 +- .../bakefiles/wxpresets/presets/wx_win32.bkl | 2 - build/bakefiles/wxwin.py | 16 +- build/cmake/files.cmake | 3 + build/files | 13 +- build/msw/makefile.gcc | 43 +- build/msw/makefile.vc | 43 +- build/msw/wx_vc14.sln | 5 - build/msw/wx_vc15.sln | 21 - build/msw/wx_vc16.sln | 5 - build/msw/wx_vc17.sln | 5 - build/msw/wx_webview.vcxproj | 18 +- build/msw/wx_webview.vcxproj.filters | 6 + build/msw/wx_webviewchromium.vcxproj | 495 ------------------ configure | 49 +- configure.ac | 31 +- docs/doxygen/mainpages/libs.h | 7 - include/wx/dlimpexp.h | 12 - include/wx/webview_chromium.h | 4 +- interface/wx/webview_chromium.h | 105 ++-- samples/webview/Makefile.in | 242 +++------ samples/webview/makefile.gcc | 2 +- samples/webview/makefile.vc | 4 +- samples/webview/webview.bkl | 115 ++-- samples/webview/webview.cpp | 54 +- ...bview_chromium.vcxproj => webview.vcxproj} | 18 +- src/common/webview_chromium.cpp | 4 +- src/msw/version.rc | 2 - src/osx/webview_chromium.mm | 4 + 36 files changed, 499 insertions(+), 1338 deletions(-) delete mode 100644 build/msw/wx_webviewchromium.vcxproj rename samples/webview/{webview_chromium.vcxproj => webview.vcxproj} (87%) diff --git a/Makefile.in b/Makefile.in index 351247ffab..433c85d74e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,6 +66,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ EXTRALIBS_STC = @EXTRALIBS_STC@ EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@ +EXTRALDFLAGS_WEBVIEW = @EXTRALDFLAGS_WEBVIEW@ WX_CPPFLAGS = @WX_CPPFLAGS@ WX_CFLAGS = @WX_CFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ @@ -1767,21 +1768,24 @@ WEBVIEWDLL_CXXFLAGS = $(__webviewdll_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \ $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW $(PIC_FLAG) $(WX_CXXFLAGS) \ - $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW -I$(top_srcdir)//3rdparty/cef \ + $(PIC_FLAG) $(WX_CXXFLAGS) $(webview_edge_pragma_warning) $(CPPFLAGS) \ + $(CXXFLAGS) WEBVIEWDLL_OBJCXXFLAGS = $(__webviewdll_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \ $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW -I$(top_srcdir)//3rdparty/cef \ + $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) WEBVIEWDLL_OBJECTS = \ - $(__webviewdll___win32rc) \ $(__WEBVIEW_SRC_PLATFORM_OBJECTS_2) \ webviewdll_webview.o \ webviewdll_webviewarchivehandler.o \ - webviewdll_webviewfshandler.o + webviewdll_webviewfshandler.o \ + webviewdll_common_webview_chromium.o \ + $(__webviewdll___win32rc) WEBVIEWDLL_ODEP = $(_____pch_wxprec_webviewdll_wx_wxprec_h_gch___depname) WEBVIEWLIB_CXXFLAGS = $(__webviewlib_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ @@ -1789,59 +1793,22 @@ WEBVIEWLIB_CXXFLAGS = $(__webviewlib_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \ $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ - $(WX_CXXFLAGS) $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS) + -I$(top_srcdir)//3rdparty/cef $(WX_CXXFLAGS) \ + $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS) WEBVIEWLIB_OBJCXXFLAGS = $(__webviewlib_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \ $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ - $(CPPFLAGS) $(OBJCXXFLAGS) + -I$(top_srcdir)//3rdparty/cef $(CPPFLAGS) $(OBJCXXFLAGS) WEBVIEWLIB_OBJECTS = \ $(__WEBVIEW_SRC_PLATFORM_OBJECTS_3) \ webviewlib_webview.o \ webviewlib_webviewarchivehandler.o \ - webviewlib_webviewfshandler.o + webviewlib_webviewfshandler.o \ + webviewlib_common_webview_chromium.o WEBVIEWLIB_ODEP = $(_____pch_wxprec_webviewlib_wx_wxprec_h_gch___depname) -WEBVIEWCHROMIUMDLL_CXXFLAGS = $(__webviewchromiumdll_PCH_INC) \ - $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -DWXBUILDING -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW_CHROMIUM \ - -I$(top_srcdir)//3rdparty/cef $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) \ - $(CXXFLAGS) -WEBVIEWCHROMIUMDLL_OBJCXXFLAGS = $(__webviewchromiumdll_PCH_INC) \ - $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -DWXBUILDING -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) \ - $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -DWXBUILDING -I$(top_srcdir)//3rdparty/cef $(WX_CXXFLAGS) $(CPPFLAGS) \ - $(CXXFLAGS) -WEBVIEWCHROMIUMLIB_OBJCXXFLAGS = $(__webviewchromiumlib_PCH_INC) \ - $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) \ - -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -DWXBUILDING -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) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \ $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -2301,14 +2268,6 @@ LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_ @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_LINK = -F$(top_srcdir)//3rdparty/cef/Release/ \ - -framework Chromium\ Embedded\ Framework -@COND_PLATFORM_MACOSX_1@LIBCEF_LINK = $(COND_PLATFORM_MACOSX_1_LIBCEF_LINK) -COND_PLATFORM_UNIX_1_LIBCEF_LINK = -L$(top_srcdir)//3rdparty/cef/Release/ \ - -Wl,--no-as-needed -lcef -Wl,--as-needed -@COND_PLATFORM_UNIX_1@LIBCEF_LINK = $(COND_PLATFORM_UNIX_1_LIBCEF_LINK) -@COND_PLATFORM_WIN32_1@LIBCEF_LINK = \ -@COND_PLATFORM_WIN32_1@ $(top_srcdir)//3rdparty/cef/Release/libcef/libcef.lib @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 @@ -4088,7 +4047,8 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ $(WEBVIEW_HDR_PLATFORM) \ wx/webview.h \ wx/webviewarchivehandler.h \ - wx/webviewfshandler.h + wx/webviewfshandler.h \ + wx/webview_chromium.h @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS) COND_MONOLITHIC_1_SHARED_1___monodll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -4277,6 +4237,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_webview.o \ monodll_webviewarchivehandler.o \ monodll_webviewfshandler.o \ + monodll_common_webview_chromium.o \ monodll_debugrpt.o \ monodll_dbgrptg.o \ monodll_xh_activityindicator.o \ @@ -5879,7 +5840,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = \ @COND_TOOLKIT_MSW@ monodll_helpbest.o monodll_chm.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS \ -@COND_PLATFORM_MACOSX_1@ = monodll_osx_webview_webkit.o +@COND_PLATFORM_MACOSX_1@ = monodll_osx_webview_chromium.o \ +@COND_PLATFORM_MACOSX_1@ monodll_osx_webview_webkit.o @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \ @COND_TOOLKIT_GTK@ monodll_gtk_webview_webkit.o monodll_webview_webkit2.o @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = \ @@ -6037,6 +5999,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_webview.o \ monolib_webviewarchivehandler.o \ monolib_webviewfshandler.o \ + monolib_common_webview_chromium.o \ monolib_debugrpt.o \ monolib_dbgrptg.o \ monolib_xh_activityindicator.o \ @@ -7639,7 +7602,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = \ @COND_TOOLKIT_MSW@ monolib_helpbest.o monolib_chm.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 \ -@COND_PLATFORM_MACOSX_1@ = monolib_osx_webview_webkit.o +@COND_PLATFORM_MACOSX_1@ = monolib_osx_webview_chromium.o \ +@COND_PLATFORM_MACOSX_1@ monolib_osx_webview_webkit.o @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \ @COND_TOOLKIT_GTK@ monolib_gtk_webview_webkit.o monolib_webview_webkit2.o @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \ @@ -11383,14 +11347,15 @@ COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \ COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \ $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_USE_SOVERSOLARIS_1@__webviewdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd) -@COND_PLATFORM_WIN32_1@__webviewdll___win32rc = webviewdll_version_rc.o @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 \ -@COND_PLATFORM_MACOSX_1@ = webviewdll_osx_webview_webkit.o +@COND_PLATFORM_MACOSX_1@ = webviewdll_osx_webview_chromium.o \ +@COND_PLATFORM_MACOSX_1@ webviewdll_osx_webview_webkit.o @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \ @COND_TOOLKIT_GTK@ webviewdll_gtk_webview_webkit.o \ @COND_TOOLKIT_GTK@ webviewdll_webview_webkit2.o @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \ @COND_TOOLKIT_MSW@ webviewdll_webview_ie.o webviewdll_webview_edge.o +@COND_PLATFORM_WIN32_1@__webviewdll___win32rc = webviewdll_version_rc.o COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@__webviewlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname) @@ -11405,7 +11370,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_webviewlib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_webviewlib/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 \ -@COND_PLATFORM_MACOSX_1@ = webviewlib_osx_webview_webkit.o +@COND_PLATFORM_MACOSX_1@ = webviewlib_osx_webview_chromium.o \ +@COND_PLATFORM_MACOSX_1@ webviewlib_osx_webview_webkit.o @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \ @COND_TOOLKIT_GTK@ webviewlib_gtk_webview_webkit.o \ @COND_TOOLKIT_GTK@ webviewlib_webview_webkit2.o @@ -11413,116 +11379,6 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ @COND_TOOLKIT_MSW@ webviewlib_webview_ie.o webviewlib_webview_edge.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)u$(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)u$(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)u$(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)u$(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)u$(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)u$(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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ - $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ - $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \ - $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ - $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ - $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ - $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \ - $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ - $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(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)u$(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_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)u$(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)u$(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) @@ -12894,27 +12750,27 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ = \ -lwx_$(PORTNAME)$(WXUNIVNAME)u$(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_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_58 \ +@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_54 \ @COND_wxUSE_LIBTIFF_builtin@ = --include-dir \ @COND_wxUSE_LIBTIFF_builtin@ $(wx_top_builddir)/src/tiff/libtiff -@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p_58 = \ +@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p_54 = \ @COND_wxUSE_LIBTIFF_builtin@ --include-dir $(top_srcdir)/src/tiff/libtiff -@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p_58 = \ +@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p_54 = \ @COND_wxUSE_LIBJPEG_builtin@ --include-dir $(top_srcdir)/src/jpeg -@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p_57 = \ +@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p_53 = \ @COND_wxUSE_LIBPNG_builtin@ --include-dir $(top_srcdir)/src/png -@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p_71 = \ +@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p_67 = \ @COND_wxUSE_ZLIB_builtin@ --include-dir $(top_srcdir)/src/zlib -@COND_wxUSE_REGEX_builtin@__INC_REGEX_p_69 = \ +@COND_wxUSE_REGEX_builtin@__INC_REGEX_p_65 = \ @COND_wxUSE_REGEX_builtin@ --include-dir \ @COND_wxUSE_REGEX_builtin@ $(top_srcdir)/3rdparty/pcre/src/wx -@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p_69 = \ +@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p_65 = \ @COND_wxUSE_EXPAT_builtin@ --include-dir $(top_srcdir)/src/expat/expat/lib -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_71 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_71 = --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_WXUNIV_1@__WXUNIV_DEFINE_p_67 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_67 = --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_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @@ -12961,9 +12817,9 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ ### Targets: ### -all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__wxlexilla___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) +all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__wxlexilla___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) -install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_wxlexilla___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 +install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_wxlexilla___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 $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets @@ -12999,7 +12855,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_wxlexilla___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 +uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_wxlexilla___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 (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 \ @@ -13018,7 +12874,6 @@ install-strip: install $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -13074,10 +12929,6 @@ clean: $(__clean_wxrc___depname) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) - rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -13219,7 +13070,7 @@ distclean: clean @COND_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlexilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxlexilla___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP) $(__wxlexilla_library_link_DEP) -@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wx_0) $(__wx_0) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(WX_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) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(EXTRALIBS_STC) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(__wxlexilla_library_link_LIBR_1) $(LIBS) +@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wx_0) $(__wx_0) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALDFLAGS_WEBVIEW) $(LDFLAGS) $(WX_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) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(EXTRALIBS_STC) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(__wxlexilla_library_link_LIBR_1) $(LIBS) @COND_MONOLITHIC_1_SHARED_1@ $(DYLIB_RPATH_POSTLINK) @COND_MONOLITHIC_1_SHARED_1@ @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd) @@ -13482,8 +13333,8 @@ distclean: clean @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxlexilla___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(WX_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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxlexilla___depname) $(__coredll___depname) $(__basedll___depname) $(__webviewdll___win32rc) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALDFLAGS_WEBVIEW) $(LDFLAGS) $(WX_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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(DYLIB_RPATH_POSTLINK) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(__webviewdll___so_symlinks_cmd) @@ -13520,44 +13371,6 @@ 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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWCHROMIUMDLL_OBJECTS) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxlexilla___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) $(__LIBCEF_WRAPPER_PATH_p) $(LIBCEF_LINK) $(LDFLAGS) $(WX_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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX) $(__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)u$(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_DIR) $(DESTDIR)$(dlldir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(dlldir) -@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)u$(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)$(dlldir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)u$(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)u$(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)u$(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)u$(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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxlexilla___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) $(WX_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)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(DYLIB_RPATH_POSTLINK) @@ -16220,6 +16033,9 @@ monodll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONODLL_ODE monodll_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp +monodll_osx_webview_chromium.o: $(srcdir)/src/osx/webview_chromium.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_chromium.mm + monodll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm @@ -16232,6 +16048,9 @@ monodll_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp monodll_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp +monodll_common_webview_chromium.o: $(srcdir)/src/common/webview_chromium.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/webview_chromium.cpp + monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp @@ -19632,7 +19451,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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --include-dir $(top_srcdir)/src/stc/lexilla/access --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/lexilla/lexlib --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src $(__webview_additional_include_wrl_p_0) $(__webview_additional_include_p_0) --define wxUSE_BASE=1 --define WXMAKINGDLL + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --include-dir $(top_srcdir)/src/stc/lexilla/access --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/lexilla/lexlib --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src $(__webview_additional_include_wrl_p_0) $(__webview_additional_include_p_0) --define wxUSE_BASE=1 --define WXMAKINGDLL monolib_any.o: $(srcdir)/src/common/any.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/any.cpp @@ -20960,6 +20779,9 @@ monolib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONOLIB_ODE monolib_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp +monolib_osx_webview_chromium.o: $(srcdir)/src/osx/webview_chromium.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_chromium.mm + monolib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm @@ -20972,6 +20794,9 @@ monolib_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp monolib_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp +monolib_common_webview_chromium.o: $(srcdir)/src/common/webview_chromium.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/webview_chromium.cpp + monolib_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp @@ -24372,7 +24197,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$@ $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 + $(WINDRES) -i$< -o$@ $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -25335,7 +25160,7 @@ baselib_osx_volume.o: $(srcdir)/src/osx/volume.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$@ $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET + $(WINDRES) -i$< -o$@ $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -25464,7 +25289,7 @@ netlib_webrequest_urlsession.o: $(srcdir)/src/osx/webrequest_urlsession.mm $(NET @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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -32895,7 +32720,7 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/bmpsvg.cpp advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) - $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_ADV + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_ADV advdll_dummy.o: $(srcdir)/src/common/dummy.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/dummy.cpp @@ -32904,7 +32729,7 @@ advlib_dummy.o: $(srcdir)/src/common/dummy.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/dummy.cpp mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) - $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_MEDIA + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -32979,7 +32804,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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_HTML + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33155,9 +32980,6 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) @COND_PLATFORM_MACOSX_1@htmllib_chm.o: $(srcdir)/src/html/chm.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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__webview_additional_include_wrl_p_0) $(__webview_additional_include_p_0) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW - webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP) $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp @@ -33170,6 +32992,9 @@ webviewdll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWD webviewdll_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(WEBVIEWDLL_ODEP) $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp +webviewdll_osx_webview_chromium.o: $(srcdir)/src/osx/webview_chromium.mm $(WEBVIEWDLL_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWDLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_chromium.mm + webviewdll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWDLL_ODEP) $(CXXC) -c -o $@ $(WEBVIEWDLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm @@ -33182,6 +33007,12 @@ webviewdll_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.c webviewdll_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(WEBVIEWDLL_ODEP) $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp +webviewdll_common_webview_chromium.o: $(srcdir)/src/common/webview_chromium.cpp $(WEBVIEWDLL_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/common/webview_chromium.cpp + +webviewdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWDLL_ODEP) + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__webview_additional_include_wrl_p_0) $(__webview_additional_include_p_0) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW --include-dir $(top_srcdir)//3rdparty/cef + webviewlib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWLIB_ODEP) $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp @@ -33194,6 +33025,9 @@ webviewlib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWL webviewlib_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(WEBVIEWLIB_ODEP) $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp +webviewlib_osx_webview_chromium.o: $(srcdir)/src/osx/webview_chromium.mm $(WEBVIEWLIB_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_chromium.mm + webviewlib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWLIB_ODEP) $(CXXC) -c -o $@ $(WEBVIEWLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm @@ -33206,23 +33040,11 @@ 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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 +webviewlib_common_webview_chromium.o: $(srcdir)/src/common/webview_chromium.cpp $(WEBVIEWLIB_ODEP) + $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/common/webview_chromium.cpp qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) - $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_QA + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33237,7 +33059,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$@ $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML + $(WINDRES) -i$< -o$@ $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33252,7 +33074,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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_XRC + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33669,7 +33491,7 @@ xrclib_xh_bookctrlbase.o: $(srcdir)/src/xrc/xh_bookctrlbase.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bookctrlbase.cpp auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) - $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_AUI + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33744,7 +33566,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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_RIBBON + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33813,7 +33635,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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33864,7 +33686,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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -33933,7 +33755,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$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --include-dir $(top_srcdir)/src/stc/lexilla/access --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/lexilla/lexlib --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define WXUSINGDLL --define WXMAKINGDLL_STC + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --include-dir $(top_srcdir)/src/stc/lexilla/access --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/lexilla/lexlib --include-dir $(top_srcdir)/src/stc/lexilla/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --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 @@ -33966,7 +33788,7 @@ stclib_PlatWXcocoa.o: $(srcdir)/src/stc/PlatWXcocoa.mm $(STCLIB_ODEP) $(CXXC) -c -o $@ $(STCLIB_OBJCXXFLAGS) $(srcdir)/src/stc/PlatWXcocoa.mm gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) - $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_71) $(__INC_REGEX_p_69) $(__INC_EXPAT_p_69) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_71) $(__DEBUG_DEFINE_p_71) $(__EXCEPTIONS_DEFINE_p_69) $(__RTTI_DEFINE_p_69) $(__THREAD_DEFINE_p_69) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define WXUSINGDLL --define WXMAKINGDLL_GL + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --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 @@ -34922,17 +34744,15 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI install_medialib uninstall_medialib wxmedia install_htmldll \ uninstall_htmldll install_htmllib uninstall_htmllib wxhtml \ install_webviewdll uninstall_webviewdll install_webviewlib \ - 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 + 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 diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 12f8ca2deb..f12a7f26ac 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -122,12 +122,6 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1[wx.bkl COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1) -dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1[wx.bkl] ### - 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 - AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1) dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1[wx.bkl] ### COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then @@ -206,12 +200,6 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1[wx.bkl COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1) -dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1[wx.bkl] ### - 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 - AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1) dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1[wx.bkl] ### COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then @@ -314,7 +302,7 @@ 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[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### +dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.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="" @@ -986,12 +974,6 @@ dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demo COND_USE_THREADS_1="" fi AC_SUBST(COND_USE_THREADS_1) -dnl ### begin block 20_COND_USE_WEBVIEW_CHROMIUM_1[../../samples/webview/webview.bkl] ### - COND_USE_WEBVIEW_CHROMIUM_1="#" - if test "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then - COND_USE_WEBVIEW_CHROMIUM_1="" - fi - AC_SUBST(COND_USE_WEBVIEW_CHROMIUM_1) dnl ### begin block 20_COND_USE_WEBVIEW_WEBKIT2_1[wx.bkl] ### COND_USE_WEBVIEW_WEBKIT2_1="#" if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 4d3030984f..5290ca7190 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -185,9 +185,6 @@ $(mk.evalExpr(wxwin.mkLibName('webview'))) - - $(mk.evalExpr(wxwin.mkLibName('webview_chromium'))) - $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -883,7 +880,8 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" $(wxwin.libToLink(value)) - $(wxwin.extraLdflags(value)) + $(wxwin.extraLdflags(value)) + $(wxwin.extraLdlibs(value)) $(wxwin.makeDspDependency(value)) diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl index c6821cd8d5..52448048e4 100644 --- a/build/bakefiles/config.bkl +++ b/build/bakefiles/config.bkl @@ -409,6 +409,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory. - - + + $(TOP_SRCDIR)/3rdparty/cef - - - - $(CEF_INCLUDE_DIR)/Release/ - - - - - - $(CEF_INCLUDE_DIR)/libcef_dll_wrapper/Release/ - - - $(CEF_INCLUDE_DIR)/libcef_dll_wrapper/ - - - $(CEF_INCLUDE_DIR)/libcef_dll_wrapper/ - - - - - - - $(LIBCEF_PATH)libcef/libcef.lib - - - - -F$(LIBCEF_PATH) -framework Chromium\ Embedded\ Framework - - - - -L$(LIBCEF_PATH) -Wl,--no-as-needed -lcef -Wl,--as-needed - - - - - - libcef_dll_wrapper - - - cef_dll_wrapper - - - cef_dll_wrapper - - - diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 0f09f481b5..a29e4e8050 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2663,12 +2663,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/webview_webkit.cpp src/gtk/webview_webkit2.cpp - src/osx/webview_webkit.mm + + src/osx/webview_chromium.mm + src/osx/webview_webkit.mm + src/common/webview.cpp src/common/webviewarchivehandler.cpp src/common/webviewfshandler.cpp + src/common/webview_chromium.cpp $(WEBVIEW_SRC_PLATFORM) @@ -2694,6 +2698,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/webview.h wx/webviewarchivehandler.h wx/webviewfshandler.h + wx/webview_chromium.h $(WEBVIEW_HDR_PLATFORM) @@ -2704,21 +2709,6 @@ 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 - wx/webview_chromium.h - - diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl index 2505829049..d70a07004f 100644 --- a/build/bakefiles/monolithic.bkl +++ b/build/bakefiles/monolithic.bkl @@ -33,6 +33,7 @@ $(EXTRALIBS_MEDIA) $(EXTRALIBS_STC) $(PLUGIN_MONOLIB_EXTRALIBS) + $(EXTRALDFLAGS_WEBVIEW) $(EXTRALIBS_WEBVIEW) $(wxscintilla_library_link) $(wxlexilla_library_link) diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index 044a475e13..1a9a454cb4 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -183,42 +183,21 @@ $(WEBVIEW_SRC) coredll basedll + $(EXTRALDFLAGS_WEBVIEW) $(EXTRALIBS_WEBVIEW) $(WEBVIEW_HDR) + $(CEF_DIR) $(WEBVIEW_SRC) $(WEBVIEW_HDR) + $(CEF_DIR) - - WXUSINGDLL - WXMAKINGDLL_WEBVIEW_CHROMIUM - $(WEBVIEWCHROMIUM_SRC) - $(WEBVIEWCHROMIUM_HDR) - coredll - basedll - webviewdll - $(CEF_INCLUDE_DIR) - $(LIBCEF_WRAPPER_PATH) - $(LIBCEF_DLL_WRAPPER_NAME) - $(LIBCEF_LINK)> - - - - $(WEBVIEWCHROMIUM_SRC) - $(WEBVIEWCHROMIUM_HDR) - $(CEF_INCLUDE_DIR) - - - - diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl index 849e2cf042..033bcbdb23 100644 --- a/build/bakefiles/wxpresets/presets/wx.bkl +++ b/build/bakefiles/wxpresets/presets/wx.bkl @@ -88,7 +88,6 @@ NOTE: as a reference here is a list of all wxWidgets libraries satisfying the dependency constraints mentioned in description: - webviewchromium webview richtext aui @@ -124,7 +123,7 @@ tag definitions. --> - base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview webviewchromium + base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview @@ -203,7 +202,6 @@ $(WXLIB_PROPGRID_NAME) $(WXLIB_RICHTEXT_NAME) $(WXLIB_WEBVIEW_NAME) - $(WXLIB_WEBVIEW_CHROMIUM_NAME) diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py index 3d19a3f44e..bcf1207ffc 100644 --- a/build/bakefiles/wxwin.py +++ b/build/bakefiles/wxwin.py @@ -39,13 +39,15 @@ def mk_wxid(id): # All libs that are part of the main library: MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'webview', - 'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc', - 'webview_chromium'] + 'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc'] # List of library names/ids for categories with different names: LIBS_NOGUI = ['xml', 'net'] LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media', - 'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview', - 'webview_chromium'] + 'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview'] +# Additional ld flags +EXTRALDFLAGS = { + 'webview' : '$(EXTRALDFLAGS_WEBVIEW)', +} # Additional libraries that must be linked in: EXTRALIBS = { 'gl' : '$(EXTRALIBS_OPENGL)', @@ -95,6 +97,12 @@ def libToLink(wxlibname): def extraLdflags(wxlibname): + if wxlibname in EXTRALDFLAGS: + return EXTRALDFLAGS[wxlibname] + else: + return '' + +def extraLdlibs(wxlibname): if wxlibname in EXTRALIBS: return EXTRALIBS[wxlibname] else: diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index 99b1f1db23..5596a6647c 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -2510,6 +2510,7 @@ set(WEBVIEW_CMN_SRC src/common/webview.cpp src/common/webviewarchivehandler.cpp src/common/webviewfshandler.cpp + src/common/webview_chromium.cpp ) set(WEBVIEW_MSW_HDR @@ -2522,6 +2523,7 @@ set(WEBVIEW_CMN_HDR wx/webview.h wx/webviewarchivehandler.h wx/webviewfshandler.h + wx/webview_chromium.h ) set(WEBVIEW_OSX_SHARED_HDR @@ -2531,6 +2533,7 @@ set(WEBVIEW_OSX_SHARED_HDR set(WEBVIEW_OSX_SHARED_SRC src/osx/webview_webkit.mm + src/osx/webview_chromium.mm ) set(WEBVIEW_GTK_HDR diff --git a/build/files b/build/files index 5341e8d0cd..495854915c 100644 --- a/build/files +++ b/build/files @@ -2466,6 +2466,7 @@ WEBVIEW_CMN_SRC = src/common/webview.cpp src/common/webviewarchivehandler.cpp src/common/webviewfshandler.cpp + src/common/webview_chromium.cpp WEBVIEW_MSW_HDR = wx/msw/webviewhistoryitem_ie.h @@ -2475,12 +2476,14 @@ WEBVIEW_CMN_HDR = wx/webview.h wx/webviewarchivehandler.h wx/webviewfshandler.h + wx/webview_chromium.h WEBVIEW_OSX_SHARED_HDR = wx/osx/webviewhistoryitem_webkit.h wx/osx/webview_webkit.h WEBVIEW_OSX_SHARED_SRC = + src/osx/webview_chromium.mm src/osx/webview_webkit.mm WEBVIEW_GTK_HDR = @@ -2496,16 +2499,6 @@ WEBVIEW2_GTK_SRC = WEBVIEW_WEBKIT2_EXTENSION_SRC = src/gtk/webview_webkit2_extension.cpp -# wxWEBVIEWCHORMIUM - -WEBVIEWCHROMIUM_HDR = - wx/webview.h - wx/webview_chromium.h -WEBVIEWCHROMIUM_SRC = - src/common/webview_chromium.cpp -WEBVIEWCHROMIUM_OSX_SHARED_SRC = - src/osx/webview_chromium.mm - # wxXRC XRC_SRC = diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 186ffc62e4..d53702447b 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1186,16 +1186,18 @@ WEBVIEWDLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \ $(__THREAD_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ - -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW -I..\..\\3rdparty\cef $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy -Wno-unknown-pragmas $(CPPFLAGS) \ + $(CXXFLAGS) WEBVIEWDLL_OBJECTS = \ $(OBJS)\webviewdll_dummy.o \ - $(OBJS)\webviewdll_version_rc.o \ $(OBJS)\webviewdll_webview_ie.o \ $(OBJS)\webviewdll_webview_edge.o \ $(OBJS)\webviewdll_webview.o \ $(OBJS)\webviewdll_webviewarchivehandler.o \ - $(OBJS)\webviewdll_webviewfshandler.o + $(OBJS)\webviewdll_webviewfshandler.o \ + $(OBJS)\webviewdll_webview_chromium.o \ + $(OBJS)\webviewdll_version_rc.o WEBVIEWLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx \ -I..\..\src\expat\expat\lib $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ @@ -1204,15 +1206,16 @@ WEBVIEWLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \ $(__THREAD_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS) + -I..\..\\3rdparty\cef $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS) WEBVIEWLIB_OBJECTS = \ $(OBJS)\webviewlib_dummy.o \ $(OBJS)\webviewlib_webview_ie.o \ $(OBJS)\webviewlib_webview_edge.o \ $(OBJS)\webviewlib_webview.o \ $(OBJS)\webviewlib_webviewarchivehandler.o \ - $(OBJS)\webviewlib_webviewfshandler.o + $(OBJS)\webviewlib_webviewfshandler.o \ + $(OBJS)\webviewlib_webview_chromium.o QADLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ -I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx -I..\..\src\expat\expat\lib \ $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ \ @@ -1752,6 +1755,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_webview.o \ $(OBJS)\monodll_webviewarchivehandler.o \ $(OBJS)\monodll_webviewfshandler.o \ + $(OBJS)\monodll_webview_chromium.o \ $(OBJS)\monodll_debugrpt.o \ $(OBJS)\monodll_dbgrptg.o \ $(OBJS)\monodll_xh_activityindicator.o \ @@ -2607,6 +2611,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_webview.o \ $(OBJS)\monolib_webviewarchivehandler.o \ $(OBJS)\monolib_webviewfshandler.o \ + $(OBJS)\monolib_webview_chromium.o \ $(OBJS)\monolib_debugrpt.o \ $(OBJS)\monolib_dbgrptg.o \ $(OBJS)\monolib_xh_activityindicator.o \ @@ -5441,7 +5446,7 @@ ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregexu$(WXDEBUGFLAG).a $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(__wxlexilla) $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP) $(__wxlexilla_library_link_DEP) $(foreach f,$(subst \,/,$(MONODLL_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme -limm32 $(__wxscintilla) $(__wxlexilla) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme -limm32 $(__wxscintilla) $(__wxlexilla) @-del $@.rsp endif endif @@ -5652,10 +5657,10 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_WEBVIEW),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(WEBVIEWDLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregexu$(WXDEBUGFLAG).a $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(__wxlexilla) $(OBJS)\webviewdll_version_rc.o $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(WEBVIEWDLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregexu$(WXDEBUGFLAG).a $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(__wxlexilla) $(__coredll___depname) $(__basedll___depname) $(OBJS)\webviewdll_version_rc.o $(foreach f,$(subst \,/,$(WEBVIEWDLL_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a @-del $@.rsp endif endif @@ -7811,6 +7816,9 @@ $(OBJS)\monodll_webviewarchivehandler.o: ../../src/common/webviewarchivehandler. $(OBJS)\monodll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_webview_chromium.o: ../../src/common/webview_chromium.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -10402,6 +10410,9 @@ $(OBJS)\monolib_webviewarchivehandler.o: ../../src/common/webviewarchivehandler. $(OBJS)\monolib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_webview_chromium.o: ../../src/common/webview_chromium.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -16681,9 +16692,6 @@ $(OBJS)\htmllib_htmllbox.o: ../../src/generic/htmllbox.cpp $(OBJS)\webviewdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\webviewdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../3rdparty/pcre/src/wx --include-dir ../../src/expat/expat/lib --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) --include-dir ../../include/wx/msw/wrl --include-dir ../../3rdparty/webview2/build/native/include --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW - $(OBJS)\webviewdll_webview_ie.o: ../../src/msw/webview_ie.cpp $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< @@ -16699,6 +16707,12 @@ $(OBJS)\webviewdll_webviewarchivehandler.o: ../../src/common/webviewarchivehandl $(OBJS)\webviewdll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\webviewdll_webview_chromium.o: ../../src/common/webview_chromium.cpp + $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\webviewdll_version_rc.o: ../../src/msw/version.rc + $(WINDRES) -i$< -o$@ --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../3rdparty/pcre/src/wx --include-dir ../../src/expat/expat/lib --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) --include-dir ../../include/wx/msw/wrl --include-dir ../../3rdparty/webview2/build/native/include --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW --include-dir ../..//3rdparty/cef + $(OBJS)\webviewlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< @@ -16717,6 +16731,9 @@ $(OBJS)\webviewlib_webviewarchivehandler.o: ../../src/common/webviewarchivehandl $(OBJS)\webviewlib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\webviewlib_webview_chromium.o: ../../src/common/webview_chromium.cpp + $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 34e023b338..9b3188dd74 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1303,15 +1303,17 @@ WEBVIEWDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ /DWXBUILDING /I..\..\3rdparty\webview2\build\native\include /DWXUSINGDLL \ - /DWXMAKINGDLL_WEBVIEW $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_webviewdll.pch" $(CPPFLAGS) $(CXXFLAGS) + /DWXMAKINGDLL_WEBVIEW /I..\..\\3rdparty\cef $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_webviewdll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) WEBVIEWDLL_OBJECTS = \ $(OBJS)\webviewdll_dummy.obj \ $(OBJS)\webviewdll_webview_ie.obj \ $(OBJS)\webviewdll_webview_edge.obj \ $(OBJS)\webviewdll_webview.obj \ $(OBJS)\webviewdll_webviewarchivehandler.obj \ - $(OBJS)\webviewdll_webviewfshandler.obj + $(OBJS)\webviewdll_webviewfshandler.obj \ + $(OBJS)\webviewdll_webview_chromium.obj WEBVIEWDLL_RESOURCES = \ $(OBJS)\webviewdll_version.res WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_363)$(__DEBUGRUNTIME) /DWIN32 \ @@ -1324,16 +1326,17 @@ WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_363)$(__DEBUGRUNTIME) /DWIN32 \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\3rdparty\webview2\build\native\include $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_webviewlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + /DWXBUILDING /I..\..\3rdparty\webview2\build\native\include \ + /I..\..\\3rdparty\cef $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_webviewlib.pch" $(CPPFLAGS) $(CXXFLAGS) WEBVIEWLIB_OBJECTS = \ $(OBJS)\webviewlib_dummy.obj \ $(OBJS)\webviewlib_webview_ie.obj \ $(OBJS)\webviewlib_webview_edge.obj \ $(OBJS)\webviewlib_webview.obj \ $(OBJS)\webviewlib_webviewarchivehandler.obj \ - $(OBJS)\webviewlib_webviewfshandler.obj + $(OBJS)\webviewlib_webviewfshandler.obj \ + $(OBJS)\webviewlib_webview_chromium.obj QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \ /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \ /I..\..\3rdparty\pcre\src\wx /I..\..\src\expat\expat\lib $(__DEBUGINFO) \ @@ -2086,6 +2089,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_webview.obj \ $(OBJS)\monodll_webviewarchivehandler.obj \ $(OBJS)\monodll_webviewfshandler.obj \ + $(OBJS)\monodll_webview_chromium.obj \ $(OBJS)\monodll_debugrpt.obj \ $(OBJS)\monodll_dbgrptg.obj \ $(OBJS)\monodll_xh_activityindicator.obj \ @@ -2941,6 +2945,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_webview.obj \ $(OBJS)\monolib_webviewarchivehandler.obj \ $(OBJS)\monolib_webviewfshandler.obj \ + $(OBJS)\monolib_webview_chromium.obj \ $(OBJS)\monolib_debugrpt.obj \ $(OBJS)\monolib_dbgrptg.obj \ $(OBJS)\monolib_xh_activityindicator.obj \ @@ -6130,7 +6135,7 @@ $(LIBDIRNAME)\wxlexilla$(WXDEBUGFLAG).lib: $(WXLEXILLA_OBJECTS) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregexu$(WXDEBUGFLAG).lib $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(__wxlexilla) $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) $(__wxlexilla_library_link_DEP) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_123) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) /LIBPATH:..\..\3rdparty\webview2\build\native\$(__webview_additional_libdirs_arch_FILENAMES) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_123) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) /LIBPATH:..\..\3rdparty\webview2\build\native\$(__webview_additional_libdirs_arch_FILENAMES) $(LDFLAGS) @<< $(MONODLL_OBJECTS) $(MONODLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib imm32.lib $(__wxscintilla) $(__wxlexilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib << !endif @@ -6258,8 +6263,8 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj $(WEBVIEWDLL_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregexu$(WXDEBUGFLAG).lib $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(__wxlexilla) $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_340) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) /LIBPATH:..\..\3rdparty\webview2\build\native\$(__webview_additional_libdirs_arch_FILENAMES) $(LDFLAGS) @<< +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj $(WEBVIEWDLL_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregexu$(WXDEBUGFLAG).lib $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(__wxlexilla) $(__coredll___depname) $(__basedll___depname) $(OBJS)\webviewdll_version.res + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_340) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) /LIBPATH:..\..\3rdparty\webview2\build\native\$(__webview_additional_libdirs_arch_FILENAMES) $(LDFLAGS) @<< $(WEBVIEWDLL_OBJECTS) $(WEBVIEWDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib << !endif @@ -8268,6 +8273,9 @@ $(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandle $(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp +$(OBJS)\monodll_webview_chromium.obj: ..\..\src\common\webview_chromium.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webview_chromium.cpp + $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp @@ -10859,6 +10867,9 @@ $(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandle $(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp +$(OBJS)\monolib_webview_chromium.obj: ..\..\src\common\webview_chromium.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webview_chromium.cpp + $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp @@ -17138,9 +17149,6 @@ $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp $(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp -$(OBJS)\webviewdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\3rdparty\pcre\src\wx /i ..\..\src\expat\expat\lib $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_73) $(__TARGET_CPU_COMPFLAG_p_73) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) /i ..\..\3rdparty\webview2\build\native\include /d WXUSINGDLL /d WXMAKINGDLL_WEBVIEW ..\..\src\msw\version.rc - $(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp @@ -17156,6 +17164,12 @@ $(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehan $(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp +$(OBJS)\webviewdll_webview_chromium.obj: ..\..\src\common\webview_chromium.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webview_chromium.cpp + +$(OBJS)\webviewdll_version.res: ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\3rdparty\pcre\src\wx /i ..\..\src\expat\expat\lib $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_73) $(__TARGET_CPU_COMPFLAG_p_73) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_67) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) /i ..\..\3rdparty\webview2\build\native\include /d WXUSINGDLL /d WXMAKINGDLL_WEBVIEW /i ..\..\\3rdparty\cef ..\..\src\msw\version.rc + $(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp @@ -17174,6 +17188,9 @@ $(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehan $(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp +$(OBJS)\webviewlib_webview_chromium.obj: ..\..\src\common\webview_chromium.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webview_chromium.cpp + $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp diff --git a/build/msw/wx_vc14.sln b/build/msw/wx_vc14.sln index 5a2099fb33..919deee727 100644 --- a/build/msw/wx_vc14.sln +++ b/build/msw/wx_vc14.sln @@ -65,11 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_webview.vcxpr {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webviewchromium", "wx_webviewchromium.vcxproj", "{BA6DA15A-B722-4296-9E8A-3900B933E57D}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} diff --git a/build/msw/wx_vc15.sln b/build/msw/wx_vc15.sln index b343caff2a..cd99d25b6b 100644 --- a/build/msw/wx_vc15.sln +++ b/build/msw/wx_vc15.sln @@ -65,11 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_webview.vcxpr {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webviewchromium", "wx_webviewchromium.vcxproj", "{BA6DA15A-B722-4296-9E8A-3900B933E57D}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} @@ -391,22 +386,6 @@ 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_vc16.sln b/build/msw/wx_vc16.sln index 2cbc556532..f7afd85945 100644 --- a/build/msw/wx_vc16.sln +++ b/build/msw/wx_vc16.sln @@ -65,11 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_webview.vcxpr {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webviewchromium", "wx_webviewchromium.vcxproj", "{BA6DA15A-B722-4296-9E8A-3900B933E57D}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} diff --git a/build/msw/wx_vc17.sln b/build/msw/wx_vc17.sln index c1bd45082d..c4ec857e1a 100644 --- a/build/msw/wx_vc17.sln +++ b/build/msw/wx_vc17.sln @@ -65,11 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_webview.vcxpr {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webviewchromium", "wx_webviewchromium.vcxproj", "{BA6DA15A-B722-4296-9E8A-3900B933E57D}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} diff --git a/build/msw/wx_webview.vcxproj b/build/msw/wx_webview.vcxproj index 3080e50531..66a15ee1c5 100644 --- a/build/msw/wx_webview.vcxproj +++ b/build/msw/wx_webview.vcxproj @@ -138,7 +138,7 @@ Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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 @@ -173,7 +173,7 @@ Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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 @@ -209,7 +209,7 @@ MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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 $(wxReleaseRuntimeLibrary) @@ -247,7 +247,7 @@ MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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 $(wxReleaseRuntimeLibrary) @@ -284,7 +284,7 @@ Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -325,7 +325,7 @@ Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -365,7 +365,7 @@ MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) @@ -409,7 +409,7 @@ MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;%(AdditionalIncludeDirectories) + $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\3rdparty\webview2\build\native\include;..\..\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;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) @@ -459,6 +459,7 @@ + @@ -496,6 +497,7 @@ + diff --git a/build/msw/wx_webview.vcxproj.filters b/build/msw/wx_webview.vcxproj.filters index 50260adacc..d92aa9bd94 100644 --- a/build/msw/wx_webview.vcxproj.filters +++ b/build/msw/wx_webview.vcxproj.filters @@ -24,6 +24,9 @@ Common Sources + + Common Sources + Common Sources @@ -55,6 +58,9 @@ Common Headers + + Common Headers + Common Headers diff --git a/build/msw/wx_webviewchromium.vcxproj b/build/msw/wx_webviewchromium.vcxproj deleted file mode 100644 index 16ac980acd..0000000000 --- a/build/msw/wx_webviewchromium.vcxproj +++ /dev/null @@ -1,495 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - webviewchromium - {BA6DA15A-B722-4296-9E8A-3900B933E57D} - - - - - DynamicLibrary - - - DynamicLibrary - - - DynamicLibrary - - - DynamicLibrary - - - StaticLibrary - - - StaticLibrary - - - StaticLibrary - - - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - 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;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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 - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - 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);..\..\3rdparty\cef\Debug\;..\..\3rdparty\cef\Debug\lib;..\..\3rdparty\cef\out\Debug\lib\;%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - 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;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(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;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - 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;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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 - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - 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);..\..\3rdparty\cef\Release\;..\..\3rdparty\cef\out\Release\lib\;%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - 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;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(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;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - true - true - true - true - - - - - - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - - - - - - \ No newline at end of file diff --git a/configure b/configure index 8e95d364b6..f558ca9a65 100755 --- a/configure +++ b/configure @@ -676,7 +676,6 @@ COND_WITH_PLUGIN_SDL_1 COND_WINDOWS_IMPLIB_1 COND_USE_XML_1 COND_USE_WEBVIEW_WEBKIT2_1 -COND_USE_WEBVIEW_CHROMIUM_1 COND_USE_THREADS_1 COND_USE_THREADS_0 COND_USE_STC_1 @@ -776,7 +775,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 -COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1 COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 @@ -807,7 +805,6 @@ COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1 COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1 COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 -COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 @@ -821,7 +818,6 @@ COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1 COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 -COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 @@ -902,6 +898,7 @@ TOOLKIT_LOWERCASE DEBUG_FLAG DEBUG_INFO WITH_PLUGIN_SDL +EXTRALDFLAGS_WEBVIEW EXTRALIBS_WEBVIEW EXTRALIBS_STC EXTRALIBS_SDL @@ -39715,6 +39712,14 @@ $as_echo "$as_me: WARNING: wxWebView Edge backend only available under MSW, igno fi if test "$wxUSE_WEBVIEW_CHROMIUM" = "yes"; then + CEF_DIR="$srcdir/3rdparty/cef" + CEF_DLL_WRAPPER_DIR="$CEF_DIR/libcef_dll_wrapper" + + EXTRALIBS_WEBVIEW="-L$CEF_DLL_WRAPPER_DIR -lcef_dll_wrapper $EXTRALIBS_WEBVIEW" + if test "$wxUSE_MAC" != 1; then + EXTRALDFLAGS_WEBVIEW="-L$CEF_DIR/Release -Wl,--no-as-needed -lcef -Wl,--as-needed" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CEF" >&5 $as_echo_n "checking for CEF... " >&6; } if ${wx_cv_lib_cef+:} false; then : @@ -39729,7 +39734,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-I$srcdir/3rdparty/cef $CPPFLAGS" + CPPFLAGS="-I$CEF_DIR $CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "include/cef_version.h" @@ -39752,14 +39757,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$wx_cv_lib_cef" = "yes"; then old_LIBS="$LIBS" - CEF_DIR="$srcdir/3rdparty/cef" - CEF_DLL_WRAPPER_DIR="$CEF_DIR/libcef_dll_wrapper" - - if test "$wxUSE_MAC" != 1; then - CEF_LIB="-L$CEF_DIR/Release -lcef" - fi - - LIBS="-L$CEF_DLL_WRAPPER_DIR -lcef_dll_wrapper $CEF_LIB $LIBS" + LIBS="$EXTRALDFLAGS_WEBVIEW $EXTRALIBS_WEBVIEW $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39803,6 +39801,10 @@ fi $as_echo "$wx_cv_lib_cef" >&6; } if test "$wx_cv_lib_cef" = "yes"; then + if test "$wxUSE_MAC" = 1; then + EXTRALIBS_WEBVIEW="-F$CEF_DIR/Release -framework Chromium\ Embedded\ Framework $EXTRALIBS_WEBVIEW" + fi + wxUSE_WEBVIEW="yes" USE_WEBVIEW_CHROMIUM=1 $as_echo "#define wxUSE_WEBVIEW_CHROMIUM 1" >>confdefs.h @@ -41022,6 +41024,7 @@ fi + TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` @@ -42502,11 +42505,6 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="" fi - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="" - fi - COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" @@ -42572,11 +42570,6 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="" fi - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_CHROMIUM_1="" - fi - COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" @@ -42727,11 +42720,6 @@ EOF COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="" fi - COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$SHARED" = "x1" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then - COND_PLATFORM_MACOSX_1_SHARED_1_USE_WEBVIEW_CHROMIUM_1="" - fi - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="" @@ -43227,11 +43215,6 @@ EOF COND_USE_THREADS_1="" fi - COND_USE_WEBVIEW_CHROMIUM_1="#" - if test "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then - COND_USE_WEBVIEW_CHROMIUM_1="" - fi - COND_USE_WEBVIEW_WEBKIT2_1="#" if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then COND_USE_WEBVIEW_WEBKIT2_1="" diff --git a/configure.ac b/configure.ac index f263ed641b..51b0c6cee6 100644 --- a/configure.ac +++ b/configure.ac @@ -6904,13 +6904,23 @@ if test "$wxUSE_WEBVIEW" = "yes"; then fi if test "$wxUSE_WEBVIEW_CHROMIUM" = "yes"; then + CEF_DIR="$srcdir/3rdparty/cef" + CEF_DLL_WRAPPER_DIR="$CEF_DIR/libcef_dll_wrapper" + + EXTRALIBS_WEBVIEW="-L$CEF_DLL_WRAPPER_DIR -lcef_dll_wrapper $EXTRALIBS_WEBVIEW" + if test "$wxUSE_MAC" != 1; then + dnl We need to make sure that libcef.so is loaded + dnl first, so ensure that it is always linked in. + EXTRALDFLAGS_WEBVIEW="-L$CEF_DIR/Release -Wl,--no-as-needed -lcef -Wl,--as-needed" + fi + AC_CACHE_CHECK([for CEF], wx_cv_lib_cef, [ AC_LANG_PUSH(C++) dnl Search for the Chromium headers in 3rdparty/cef old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-I$srcdir/3rdparty/cef $CPPFLAGS" + CPPFLAGS="-I$CEF_DIR $CPPFLAGS" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([#include "include/cef_version.h"], [])], [wx_cv_lib_cef=yes], @@ -6921,14 +6931,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then if test "$wx_cv_lib_cef" = "yes"; then old_LIBS="$LIBS" - CEF_DIR="$srcdir/3rdparty/cef" - CEF_DLL_WRAPPER_DIR="$CEF_DIR/libcef_dll_wrapper" - - if test "$wxUSE_MAC" != 1; then - CEF_LIB="-L$CEF_DIR/Release -lcef" - fi - - LIBS="-L$CEF_DLL_WRAPPER_DIR -lcef_dll_wrapper $CEF_LIB $LIBS" + LIBS="$EXTRALDFLAGS_WEBVIEW $EXTRALIBS_WEBVIEW $LIBS" AC_LINK_IFELSE([ AC_LANG_SOURCE([ @@ -6956,6 +6959,15 @@ if test "$wxUSE_WEBVIEW" = "yes"; then ) if test "$wx_cv_lib_cef" = "yes"; then + dnl This is a horrible hack but there simply doesn't seem to be a + dnl way to pass a string containing spaces as a single argument, so + dnl we can't include it in LIBS above, but luckily the test program + dnl actually links under Mac even without it, so we just add it + dnl here after the test, so it's used when linking our actual code. + if test "$wxUSE_MAC" = 1; then + EXTRALIBS_WEBVIEW="-F$CEF_DIR/Release -framework Chromium\ Embedded\ Framework $EXTRALIBS_WEBVIEW" + fi + wxUSE_WEBVIEW="yes" USE_WEBVIEW_CHROMIUM=1 AC_DEFINE(wxUSE_WEBVIEW_CHROMIUM) @@ -7786,6 +7798,7 @@ AC_SUBST(EXTRALIBS_OPENGL) AC_SUBST(EXTRALIBS_SDL) AC_SUBST(EXTRALIBS_STC) AC_SUBST(EXTRALIBS_WEBVIEW) +AC_SUBST(EXTRALDFLAGS_WEBVIEW) AC_SUBST(WITH_PLUGIN_SDL) AC_SUBST(DEBUG_INFO) AC_SUBST(DEBUG_FLAG) diff --git a/docs/doxygen/mainpages/libs.h b/docs/doxygen/mainpages/libs.h index 11c0251f89..de2c50aace 100644 --- a/docs/doxygen/mainpages/libs.h +++ b/docs/doxygen/mainpages/libs.h @@ -40,7 +40,6 @@ digraph Dependencies wxSTC [fillcolor = green, URL = "\ref page_libs_wxstc"]; wxXRC [fillcolor = green, URL = "\ref page_libs_wxxrc"]; wxWebView [fillcolor = green, URL = "\ref page_libs_wxwebview"]; - wxWebViewChromium [fillcolor = green, URL = "\ref page_libs_wxwebview_chromium"]; wxCore -> wxBase; wxNet -> wxBase; @@ -57,7 +56,6 @@ digraph Dependencies wxSTC -> wxCore; wxXRC -> wxCore; wxXRC -> wxHTML; wxXRC -> wxXML; wxWebView -> wxCore; - wxWebViewChromium -> wxWebView; } @enddot @@ -181,11 +179,6 @@ The wxWebView library contains the wxWebView control and its associated classes. Requires @ref page_libs_wxcore, @ref page_libs_wxbase. -@section page_libs_wxwebview_chromium wxWebViewChromium - -The wxWebViewChromium library contains the wxWebViewChromium backend. - -Requires @ref page_libs_wxwebview. @section page_libs_wxxml wxXML diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index 12403766f8..a1be764de0 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -74,7 +74,6 @@ # define WXMAKINGDLL_MEDIA # define WXMAKINGDLL_STC # define WXMAKINGDLL_WEBVIEW -# define WXMAKINGDLL_WEBVIEW_CHROMIUM #endif /* WXMAKINGDLL */ /* @@ -252,17 +251,6 @@ # define WXDLLIMPEXP_DATA_WEBVIEW(type) type #endif -#ifdef WXMAKINGDLL_WEBVIEW_CHROMIUM -# define WXDLLIMPEXP_WEBVIEW_CHROMIUM WXEXPORT -# define WXDLLIMPEXP_DATA_WEBVIEW_CHROMIUM(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_WEBVIEW_CHROMIUM WXIMPORT -# define WXDLLIMPEXP_DATA_WEBVIEW_CHROMIUM(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_WEBVIEW_CHROMIUM -# define WXDLLIMPEXP_DATA_WEBVIEW_CHROMIUM(type) type -#endif - /* GCC warns about using __attribute__ (and also __declspec in mingw32 case) on forward declarations while MSVC complains about forward declarations without diff --git a/include/wx/webview_chromium.h b/include/wx/webview_chromium.h index 4c6c2e179e..6036b2dde9 100644 --- a/include/wx/webview_chromium.h +++ b/include/wx/webview_chromium.h @@ -14,7 +14,7 @@ #include "wx/webview.h" #include "wx/timer.h" -extern WXDLLIMPEXP_DATA_WEBVIEW_CHROMIUM(const char) wxWebViewBackendChromium[]; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendChromium[]; // Private namespace containing classes used only in the implementation. namespace wxCEF @@ -23,7 +23,7 @@ class ClientHandler; struct ImplData; } -class WXDLLIMPEXP_WEBVIEW_CHROMIUM wxWebViewChromium : public wxWebView +class WXDLLIMPEXP_WEBVIEW wxWebViewChromium : public wxWebView { public: wxWebViewChromium() { Init(); } diff --git a/interface/wx/webview_chromium.h b/interface/wx/webview_chromium.h index 621c883c23..1532149c6f 100644 --- a/interface/wx/webview_chromium.h +++ b/interface/wx/webview_chromium.h @@ -31,37 +31,57 @@ __General__ - The wxWebViewChromium backend is built into a separate webview_chromium - library which depends on the webview library. + When wxWebViewChromium backend is enabled, it is compiled as part of the + webview library which means that this library depends on CEF and all + applications using it must be linked with it. - When building with CMake enable wxUSE_WEBVIEW_CHROMIUM and CEF can be - automatically downloaded during configuration based on your platform. - You can also download it manually from the CEF official binaries site at - https://cef-builds.spotifycdn.com/index.html and then build only - `libcef_dll_wrapper` -- but not the `libcef` itself. + Currently building wxWebViewChromium is possible only with configure-based + build system under Unix (including macOS) and using the provided MSVS + project files under MSW. Notably building it using CMake does not work. - For other build systems please follow the following instructions: + Before enabling wxWebViewChromium you need to ensure that CEF is available: - Once you have a copy of CEF, either from compiling it yourself or using - prebuilt binaries, you should copy it into `wx_root/3rdparty/cef`. To run the - webview_chromium sample you need to copy the CEF resources into the - sample directory. The following files need to be copied: + 1. Download the binaries for your platform from the CEF official site at + https://cef-builds.spotifycdn.com/index.html ("Minimal Distribution" is + sufficient) + 2. Unpack the archive into `3rdparty/cef` directory under wxWidgets source + directory. + 3. Build `libcef_dll_wrapper` using the instructions provided in the CEF + distribution, but, in short, just by using `cmake` to do it. + 4. Copy the static library binary in the platform-dependent location: + - Under MSW, copy `libcefl_dll_wrapper.lib` file to either + `3rdparty/cef/Release` or `3rdparty/cef/Debug` depending on the build + configuration (it's recommended to build CEF wrapper in both + configurations and so copy the two files to both locations). + - Under Unix (including macOS), copy `libcef_dll_wrapper.a` file to + `3rdparty/cef/libcef_dll_wrapper` directory. - - All files from either `wx_root/3rdparty/cef/Debug` or - `wx_root/3rdparty/cef/Release` folder, depending on your build type + Then enable wxWebViewChromium support: + + - Under MSW, set `wxUSE_WEBVIEW_CHROMIUM` to 1 in `wx/msw/setup.h`. + - Under Unix, add `--enable-webviewchromium` option to configure command + line. + + Finally, build wxWidgets as usual: the resulting webview library will + include wxWebViewChromium. + + It is recommended to build webview sample to check that everything is + working as expected. Under Unix, the required CEF files will be copied to + the sample directory as part of the build process, but under MSW you need + to copy them manually before running the sample: please copy + + - All files from either `3rdparty/cef/Debug` or + `3rdparty/cef/Release` folder, depending on your build type - The contents of the wx_root/3rdparty/cef/Resources folder. + to the directory containing `webview` executable. + Please see CEF `README.txt` for more details and also note that when redistributing CEF you must abide by the terms of its `LICENSE.txt`. - When building wxWidgets you need to ensure wxWebViewChromium is enabled, - either by passing --enable-webviewchromium for autoconf based builds or - setting wxUSE_WEBVIEW_CHROMIUM equal to 1 in setup.h for Visual Studio - based builds. - - When running applications using wxWebViewChromium, the command line option - `--type=xxx` is interpreted specially as it is used by CEF to launch helper - applications, so your program must not use this option for anything else. + Note that by default the webview sample uses the default platform-dependent + wxWebView backend and to use Chromium backend in it you need to set + `WX_WEBVIEW_BACKEND` environment variable to the value `wxWebViewChromium`. __Microsoft Windows Platform__ @@ -72,6 +92,9 @@ Microsoft Visual C++ 2022 must be used to build wxWebViewChromium. + When linking an application using it, both `libcef.lib` and + `libcef_dll_wrapper.lib` should be included in the libraries list. + __Linux with GTK__ wxWebviewChromium currently only supports X11 and not Wayland, i.e. you @@ -101,9 +124,9 @@ etc) are required. For applications using wxWebviewChromium, below are the steps to make - it work, based off the webview_chromium sample bakefile. + it work, based off the webview sample bakefile. - 1. Build the webview_chromium library. + 1. Build the webview library with CEF support. 2. Compile/link/package the `YourApp helper` app: - Require `cef_process_helper.cpp` - Require link frameworks: Chromium Embedded Framework.framework, @@ -122,31 +145,31 @@ Below is the wxWebviewChromium sample app bundle directory structure, omitting some resource files - webview_chromium.app + webview.app |____Contents |____MacOS - | |____webview_chromium + | |____webview |____Resources | |____wxmac.icns |____Frameworks - | |____webview_chromium Helper.app + | |____webview Helper.app | | |____Contents | | |____MacOS - | | | |____webview_chromium Helper + | | | |____webview Helper | | |____Resources | | | |____wxmac.icns | | |____Info.plist - | |____webview_chromium Helper (GPU).app + | |____webview Helper (GPU).app | | |____Contents | | |____MacOS - | | | |____webview_chromium Helper (GPU) + | | | |____webview Helper (GPU) | | |____Resources | | | |____wxmac.icns | | |____Info.plist - | |____webview_chromium Helper (Plugin).app + | |____webview Helper (Plugin).app | | |____Contents | | |____MacOS - | | | |____webview_chromium Helper (Plugin) + | | | |____webview Helper (Plugin) | | |____Resources | | | |____wxmac.icns | | |____Info.plist @@ -166,23 +189,31 @@ | | | |____libvk_swiftshader.dylib | | | |____libGLESv2.dylib | | |____Chromium Embedded Framework - | |____webview_chromium Helper (Renderer).app + | |____webview Helper (Renderer).app | | |____Contents | | |____MacOS - | | | |____webview_chromium Helper (Renderer) + | | | |____webview Helper (Renderer) | | |____Resources | | | |____wxmac.icns | | |____Info.plist - | |____webview_chromium Helper (Alerts).app + | |____webview Helper (Alerts).app | |____Contents | |____MacOS - | | |____webview_chromium Helper (Alerts) + | | |____webview Helper (Alerts) | |____Resources | | |____wxmac.icns | |____Info.plist |____Info.plist + __Miscellaneous Notes__ + + When running applications using wxWebViewChromium, the command line option + `--type=xxx` is interpreted specially as it is used by CEF to launch helper + applications, so your program must not use this option for anything else. + + + @section differences API Differences wxWebViewChromium aims to support the full wxWebView API, but there are @@ -197,7 +228,7 @@ if the @a output parameter is non-null, the function will always return false. @since 3.3.0 - @library{wxwebview_chromium} + @library{wxwebview} @category{webview} **/ diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in index 9c1878b7b0..c28f9e2d26 100644 --- a/samples/webview/Makefile.in +++ b/samples/webview/Makefile.in @@ -34,6 +34,7 @@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_STC = @EXTRALIBS_STC@ EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@ +EXTRALDFLAGS_WEBVIEW = @EXTRALDFLAGS_WEBVIEW@ WX_CPPFLAGS = @WX_CPPFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_LDFLAGS = @WX_LDFLAGS@ @@ -55,32 +56,15 @@ WEBVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ WEBVIEW_OBJECTS = \ $(__webview___win32rc) \ webview_webview.o -WEBVIEW_CHROMIUM_HELPER_CXXFLAGS = -I$(top_srcdir)//3rdparty/cef $(CPPFLAGS) \ +WEBVIEW_HELPER_CXXFLAGS = -I$(top_srcdir)//3rdparty/cef $(CPPFLAGS) \ $(CXXFLAGS) -WEBVIEW_CHROMIUM_HELPER_OBJECTS = \ - webview_chromium_helper_cef_process_helper.o -WEBVIEW_CHROMIUM_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples -DwxWEBVIEW_SAMPLE_CHROMIUM \ - -I$(top_srcdir)//3rdparty/cef $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) \ - $(CPPFLAGS) $(CXXFLAGS) -WEBVIEW_CHROMIUM_OBJECTS = \ - webview_chromium_webview.o \ - $(__webview_chromium___win32rc) +WEBVIEW_HELPER_OBJECTS = \ + webview_helper_cef_process_helper.o ### Conditionally set variables: ### @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) -COND_PLATFORM_MACOSX_1_LIBCEF_LINK = -F$(top_srcdir)//3rdparty/cef/Release/ \ - -framework Chromium\ Embedded\ Framework -@COND_PLATFORM_MACOSX_1@LIBCEF_LINK = $(COND_PLATFORM_MACOSX_1_LIBCEF_LINK) -COND_PLATFORM_UNIX_1_LIBCEF_LINK = -L$(top_srcdir)//3rdparty/cef/Release/ \ - -Wl,--no-as-needed -lcef -Wl,--as-needed -@COND_PLATFORM_UNIX_1@LIBCEF_LINK = $(COND_PLATFORM_UNIX_1_LIBCEF_LINK) -@COND_PLATFORM_WIN32_1@LIBCEF_LINK = \ -@COND_PLATFORM_WIN32_1@ $(top_srcdir)//3rdparty/cef/Release/libcef/libcef.lib @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -91,15 +75,30 @@ COND_PLATFORM_UNIX_1_LIBCEF_LINK = -L$(top_srcdir)//3rdparty/cef/Release/ \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL +@COND_PLATFORM_WIN32_1@__WIN32_DPI_MANIFEST_p = \ +@COND_PLATFORM_WIN32_1@ --define \ +@COND_PLATFORM_WIN32_1@ wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep webview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__webview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___webview___os2_emxbindcmd) +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__webview___win32rc = webview_sample_rc.o @COND_PLATFORM_MACOSX_1@__webview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = webview.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__webview_bundle___depname = webview_bundle -@COND_TOOLKIT_COCOA@____webview_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ $(__webview_app_Contents_PkgInfo___depname) @COND_TOOLKIT_MAC@____webview_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_MAC@ $(__webview_app_Contents_PkgInfo___depname) @COND_TOOLKIT_OSX_CARBON@____webview_BUNDLE_TGT_REF_DEP \ @@ -108,63 +107,8 @@ COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \ @COND_TOOLKIT_OSX_COCOA@ = $(__webview_app_Contents_PkgInfo___depname) @COND_TOOLKIT_OSX_IPHONE@____webview_BUNDLE_TGT_REF_DEP \ @COND_TOOLKIT_OSX_IPHONE@ = $(__webview_app_Contents_PkgInfo___depname) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \ -@COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p) -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__webview_chromium_helper___depname \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ webview_chromium_helper$(EXEEXT) -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__fix_cef_link___depname \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = fix_cef_link -@COND_USE_WEBVIEW_CHROMIUM_1@__webview_chromium___depname \ -@COND_USE_WEBVIEW_CHROMIUM_1@ = webview_chromium$(EXEEXT) -COND_PLATFORM_OS2_1___webview_chromium___os2_emxbindcmd = $(NM) \ - webview_chromium$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ - webview_chromium$(EXEEXT) ; fi -@COND_PLATFORM_OS2_1@__webview_chromium___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___webview_chromium___os2_emxbindcmd) -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__webview_chromium_app_Contents_PkgInfo___depname \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ webview_chromium.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__webview_chromium_bundle___depname \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = webview_chromium_bundle -@COND_TOOLKIT_COCOA@____webview_chromium_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_COCOA@ = \ -@COND_TOOLKIT_COCOA@ $(__webview_chromium_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_MAC@____webview_chromium_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_MAC@ = $(__webview_chromium_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_CARBON@____webview_chromium_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_CARBON@ = \ -@COND_TOOLKIT_OSX_CARBON@ $(__webview_chromium_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_COCOA@____webview_chromium_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_COCOA@ = \ -@COND_TOOLKIT_OSX_COCOA@ $(__webview_chromium_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_IPHONE@____webview_chromium_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_IPHONE@ = \ -@COND_TOOLKIT_OSX_IPHONE@ $(__webview_chromium_app_Contents_PkgInfo___depname) -@COND_PLATFORM_WIN32_1@__webview_chromium___win32rc \ -@COND_PLATFORM_WIN32_1@ = webview_chromium_sample_rc.o -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__package___depname \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = package -@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \ -@COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL -@COND_PLATFORM_WIN32_1@__WIN32_DPI_MANIFEST_p = \ -@COND_PLATFORM_WIN32_1@ --define \ -@COND_PLATFORM_WIN32_1@ wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_TOOLKIT_COCOA@____webview_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ $(__webview_app_Contents_PkgInfo___depname) COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0_USE_WEBVIEW_1@__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p) @@ -177,11 +121,14 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__package___depname \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = package COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_STC_1@__LIB_LEXILLA_p = \ -@COND_USE_STC_1@ -lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \ +@COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p) +@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p) @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @@ -197,21 +144,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_wxUSE_REGEX_builtin@ -lwxregexu$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \ @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@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_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_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__webview_helper___depname \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = webview_helper$(EXEEXT) +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__fix_cef_link___depname \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ = fix_cef_link @COND_USE_STC_1@__LIB_SCINTILLA_p = \ @COND_USE_STC_1@ -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_STC_1@__LIB_LEXILLA_p = \ +@COND_USE_STC_1@ -lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) ### Targets: ### -all: webview$(EXEEXT) $(__webview_bundle___depname) data $(__webview_chromium_helper___depname) $(__fix_cef_link___depname) $(__webview_chromium___depname) $(__webview_chromium_bundle___depname) $(__package___depname) +all: webview$(EXEEXT) $(__webview_bundle___depname) $(__package___depname) data $(__webview_helper___depname) $(__fix_cef_link___depname) install: @@ -224,16 +168,14 @@ clean: rm -f ./*.o rm -f webview$(EXEEXT) rm -rf webview.app - rm -f webview_chromium_helper$(EXEEXT) - rm -rf webview_chromium_helper.app - rm -f webview_chromium$(EXEEXT) - rm -rf webview_chromium.app + rm -f webview_helper$(EXEEXT) + rm -rf webview_helper.app distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc) - $(CXX) -o $@ $(WEBVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(CXX) -o $@ $(WEBVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(EXTRALDFLAGS_WEBVIEW) $(EXTRALDFLAGS_WEBVIEW) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__webview___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@webview.app/Contents/PkgInfo: webview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -263,6 +205,24 @@ webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc) @COND_PLATFORM_MACOSX_1@webview_bundle: $(____webview_BUNDLE_TGT_REF_DEP) +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@package: $(__webview_helper___depname) +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview.app/Contents/Frameworks/ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview.app/Contents/Frameworks/webview\ Helper.app +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -Rf $(top_srcdir)//3rdparty/cef/Release/Chromium\ Embedded\ Framework.framework webview.app/Contents/Frameworks/ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -Rf webview_helper.app/ webview.app/Contents/Frameworks/webview\ Helper.app/ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ for name in Alerts GPU Plugin Renderer; do \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ helper_name="webview Helper ($$name)"; \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ helper_contents="webview.app/Contents/Frameworks/$$helper_name.app/Contents"; \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p "$$helper_contents/MacOS"; \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ ln -fs "../../../webview Helper.app/Contents/MacOS/webview Helper" "$$helper_contents/MacOS/$$helper_name"; \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ sed -e "s/\$${PRODUCT_NAME}/$$helper_name/" \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${EXECUTABLE_NAME}/$$helper_name/" \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(top_srcdir)//samples/webview/cef_helper_info.plist.in > "$$helper_contents/Info.plist"; \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp webview_helper.app/Contents/PkgInfo "$$helper_contents"; \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -Rf webview_helper.app/Contents/Resources "$$helper_contents"; \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ done + data: @mkdir -p . @for f in handler_advanced.html; do \ @@ -275,92 +235,36 @@ data: esac; \ done -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_chromium_helper$(EXEEXT): $(WEBVIEW_CHROMIUM_HELPER_OBJECTS) -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(CXX) -o $@ $(WEBVIEW_CHROMIUM_HELPER_OBJECTS) $(__LIBCEF_WRAPPER_PATH_p) $(LIBCEF_LINK) $(LDFLAGS) $(__LIBCEF_DLL_WRAPPER_NAME_p) $(LIBS) +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_helper$(EXEEXT): $(WEBVIEW_HELPER_OBJECTS) +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(CXX) -o $@ $(WEBVIEW_HELPER_OBJECTS) $(EXTRALDFLAGS_WEBVIEW) $(LDFLAGS) $(EXTRALIBS_WEBVIEW) $(LIBS) -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@fix_cef_link: $(__webview_chromium_helper___depname) -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium_helper.app -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium_helper.app/Contents/MacOS -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium_helper.app/Contents/Resources -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ sed -e "s/\$${PRODUCT_NAME}/webview_chromium Helper/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${EXECUTABLE_NAME}/webview_chromium Helper/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(top_srcdir)//samples/webview/cef_helper_info.plist.in >webview_chromium_helper.app/Contents/Info.plist -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ /bin/echo "APPL????" >webview_chromium_helper.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@fix_cef_link: $(__webview_helper___depname) +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_helper.app +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_helper.app/Contents/MacOS +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_helper.app/Contents/Resources +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ sed -e "s/\$${PRODUCT_NAME}/webview Helper/" \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${EXECUTABLE_NAME}/webview Helper/" \ +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(top_srcdir)//samples/webview/cef_helper_info.plist.in >webview_helper.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ /bin/echo "APPL????" >webview_helper.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ @COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ install_name_tool -change \ @COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ @COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ webview_chromium_helper -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f webview_chromium_helper webview_chromium_helper.app/Contents/MacOS/webview_chromium\ Helper -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f $(top_srcdir)//src/osx/carbon/wxmac.icns webview_chromium_helper.app/Contents/Resources/wxmac.icns - -@COND_USE_WEBVIEW_CHROMIUM_1@webview_chromium$(EXEEXT): $(WEBVIEW_CHROMIUM_OBJECTS) $(__webview_chromium___win32rc) -@COND_USE_WEBVIEW_CHROMIUM_1@ $(CXX) -o $@ $(WEBVIEW_CHROMIUM_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -Wl,-rpath,. $(__LIBCEF_WRAPPER_PATH_p) $(LIBCEF_LINK) $(LDFLAGS) $(WX_LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIBCEF_DLL_WRAPPER_NAME_p) $(__LIB_SCINTILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_WEBVIEW_CHROMIUM_1@ $(__webview_chromium___os2_emxbindcmd) - -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_chromium.app/Contents/PkgInfo: $(__webview_chromium___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/MacOS -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/Resources -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.webview_chromium/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/webview_chromium/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/webview_chromium/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/webview_chromium version $(WX_VERSION), (c) 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >webview_chromium.app/Contents/Info.plist -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ /bin/echo "APPL????" >webview_chromium.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ ln -f webview_chromium$(EXEEXT) webview_chromium.app/Contents/MacOS/webview_chromium -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns webview_chromium.app/Contents/Resources/wxmac.icns - -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_chromium_bundle: $(____webview_chromium_BUNDLE_TGT_REF_DEP) - -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@package: $(__webview_chromium_helper___depname) -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/Frameworks/ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -Rf $(top_srcdir)//3rdparty/cef/Release//Chromium\ Embedded\ Framework.framework webview_chromium.app/Contents/Frameworks/ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -Rf webview_chromium_helper.app/ webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app/ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ for name in Alerts GPU Plugin Renderer; do \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ helper_name="webview_chromium Helper ($$name)"; \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ helper_contents="webview_chromium.app/Contents/Frameworks/$$helper_name.app/Contents"; \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ mkdir -p "$$helper_contents/MacOS"; \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ ln -fs "../../../webview_chromium Helper.app/Contents/MacOS/webview_chromium Helper" "$$helper_contents/MacOS/$$helper_name"; \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ sed -e "s/\$${PRODUCT_NAME}/$$helper_name/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ -e "s/\$${EXECUTABLE_NAME}/$$helper_name/" \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ $(top_srcdir)//samples/webview/cef_helper_info.plist.in > "$$helper_contents/Info.plist"; \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp webview_chromium_helper.app/Contents/PkgInfo "$$helper_contents"; \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -Rf webview_chromium_helper.app/Contents/Resources "$$helper_contents"; \ -@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ done +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ webview_helper +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f webview_helper webview_helper.app/Contents/MacOS/webview\ Helper +@COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@ cp -f $(top_srcdir)//src/osx/carbon/wxmac.icns webview_helper.app/Contents/Resources/wxmac.icns webview_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include webview_webview.o: $(srcdir)/webview.cpp $(CXXC) -c -o $@ $(WEBVIEW_CXXFLAGS) $(srcdir)/webview.cpp -webview_chromium_helper_cef_process_helper.o: $(srcdir)/cef_process_helper.cpp - $(CXXC) -c -o $@ $(WEBVIEW_CHROMIUM_HELPER_CXXFLAGS) $(srcdir)/cef_process_helper.cpp - -webview_chromium_webview.o: $(srcdir)/webview.cpp - $(CXXC) -c -o $@ $(WEBVIEW_CHROMIUM_CXXFLAGS) $(srcdir)/webview.cpp - -webview_chromium_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define wxWEBVIEW_SAMPLE_CHROMIUM --include-dir $(top_srcdir)//3rdparty/cef +webview_helper_cef_process_helper.o: $(srcdir)/cef_process_helper.cpp + $(CXXC) -c -o $@ $(WEBVIEW_HELPER_CXXFLAGS) $(srcdir)/cef_process_helper.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean webview_bundle data \ - webview_chromium_bundle +.PHONY: all install uninstall clean distclean webview_bundle data diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc index aa0bbfbab7..d12b17f893 100644 --- a/samples/webview/makefile.gcc +++ b/samples/webview/makefile.gcc @@ -219,7 +219,7 @@ clean: $(OBJS)\webview.exe: $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample_rc.o $(foreach f,$(subst \,/,$(WEBVIEW_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp data: diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc index 0f314f7396..ac8486f1be 100644 --- a/samples/webview/makefile.vc +++ b/samples/webview/makefile.vc @@ -422,8 +422,8 @@ clean: -if exist $(OBJS)\webview.pdb del $(OBJS)\webview.pdb $(OBJS)\webview.exe: $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\webview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< - $(WEBVIEW_OBJECTS) $(WEBVIEW_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\webview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< + $(WEBVIEW_OBJECTS) $(WEBVIEW_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << data: diff --git a/samples/webview/webview.bkl b/samples/webview/webview.bkl index 15b74e59f6..d3c3b48fa5 100644 --- a/samples/webview/webview.bkl +++ b/samples/webview/webview.bkl @@ -15,7 +15,36 @@ $(LIB_SCINTILLA) $(LIB_LEXILLA) + $(EXTRALDFLAGS_WEBVIEW) + $(EXTRALIBS_WEBVIEW) + + + + webview_helper + all + + mkdir -p webview.app/Contents/Frameworks/ + mkdir -p webview.app/Contents/Frameworks/webview\ Helper.app + cp -Rf $(CEF_DIR)/Release/Chromium\ Embedded\ Framework.framework webview.app/Contents/Frameworks/ + + cp -Rf webview_helper.app/ webview.app/Contents/Frameworks/webview\ Helper.app/ + for name in Alerts GPU Plugin Renderer; do \ + helper_name="webview Helper ($$name)"; \ + helper_contents="webview.app/Contents/Frameworks/$$helper_name.app/Contents"; \ + mkdir -p "$$helper_contents/MacOS"; \ + ln -fs "../../../webview Helper.app/Contents/MacOS/webview Helper" "$$helper_contents/MacOS/$$helper_name"; \ + sed -e "s/\$${PRODUCT_NAME}/$$helper_name/" \ + -e "s/\$${EXECUTABLE_NAME}/$$helper_name/" \ + $(TOP_SRCDIR)/samples/webview/cef_helper_info.plist.in > "$$helper_contents/Info.plist"; \ + cp webview_helper.app/Contents/PkgInfo "$$helper_contents"; \ + cp -Rf webview_helper.app/Contents/Resources "$$helper_contents"; \ + done + + @@ -24,37 +53,36 @@ - cef_process_helper.cpp - - $(LIBCEF_WRAPPER_PATH) - $(CEF_INCLUDE_DIR) - $(LIBCEF_DLL_WRAPPER_NAME) - $(LIBCEF_LINK) + + $(CEF_DIR) + $(EXTRALDFLAGS_WEBVIEW) + $(EXTRALIBS_WEBVIEW) - webview_chromium_helper + webview_helper 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/cef_helper_info.plist.in >webview_chromium_helper.app/Contents/Info.plist - /bin/echo "APPL????" >webview_chromium_helper.app/Contents/PkgInfo + mkdir -p webview_helper.app + mkdir -p webview_helper.app/Contents/MacOS + mkdir -p webview_helper.app/Contents/Resources + sed -e "s/\$${PRODUCT_NAME}/webview Helper/" \ + -e "s/\$${EXECUTABLE_NAME}/webview Helper/" \ + $(TOP_SRCDIR)/samples/webview/cef_helper_info.plist.in >webview_helper.app/Contents/Info.plist + /bin/echo "APPL????" >webview_helper.app/Contents/PkgInfo install_name_tool -change \ "@executable_path/../Frameworks/Chromium Embedded Framework.framework/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 + webview_helper + cp -f webview_helper webview_helper.app/Contents/MacOS/webview\ Helper + cp -f $(TOP_SRCDIR)/src/osx/carbon/wxmac.icns webview_helper.app/Contents/Resources/wxmac.icns @@ -62,57 +90,4 @@ - - - - webview.cpp - - wxWEBVIEW_SAMPLE_CHROMIUM - webviewchromium - webview - stc - core - base - -Wl,-rpath,. - - $(LIBCEF_WRAPPER_PATH) - $(CEF_INCLUDE_DIR) - $(LIBCEF_DLL_WRAPPER_NAME) - $(LIBCEF_LINK) - - ../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/ - - cp -Rf webview_chromium_helper.app/ webview_chromium.app/Contents/Frameworks/webview_chromium\ Helper.app/ - for name in Alerts GPU Plugin Renderer; do \ - helper_name="webview_chromium Helper ($$name)"; \ - helper_contents="webview_chromium.app/Contents/Frameworks/$$helper_name.app/Contents"; \ - mkdir -p "$$helper_contents/MacOS"; \ - ln -fs "../../../webview_chromium Helper.app/Contents/MacOS/webview_chromium Helper" "$$helper_contents/MacOS/$$helper_name"; \ - sed -e "s/\$${PRODUCT_NAME}/$$helper_name/" \ - -e "s/\$${EXECUTABLE_NAME}/$$helper_name/" \ - $(TOP_SRCDIR)/samples/webview/cef_helper_info.plist.in > "$$helper_contents/Info.plist"; \ - cp webview_chromium_helper.app/Contents/PkgInfo "$$helper_contents"; \ - cp -Rf webview_chromium_helper.app/Contents/Resources "$$helper_contents"; \ - done - - - - - $(LIB_SCINTILLA) - - - diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp index f43cebd248..e0d08c3c17 100644 --- a/samples/webview/webview.cpp +++ b/samples/webview/webview.cpp @@ -29,6 +29,9 @@ #include "wx/notifmsg.h" #include "wx/settings.h" #include "wx/webview.h" +#if wxUSE_WEBVIEW_CHROMIUM +#include "wx/webview_chromium.h" +#endif #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" #endif @@ -43,10 +46,7 @@ #include "wx/fs_arc.h" #include "wx/fs_mem.h" #include "wx/stdpaths.h" - -#ifdef wxWEBVIEW_SAMPLE_CHROMIUM -#include "wx/webview_chromium.h" -#endif +#include "wx/utils.h" #ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" @@ -62,6 +62,14 @@ #include +// This sample can be built with and without wxUSE_WEBVIEW_CHROMIUM, so we +// can't put the libraries in the project linker options and have to link them +// from here. +#if defined(_MSC_VER) && wxUSE_WEBVIEW_CHROMIUM + #pragma comment(lib, "libcef") + #pragma comment(lib, "libcef_dll_wrapper") +#endif + //We map menu items to their history items using wxMenuHistoryMap = std::map>; @@ -445,13 +453,39 @@ WebFrame::WebFrame(const wxString& url, bool isMain, wxWebViewWindowFeatures* wi wxLogMessage("Using fixed edge version"); } #endif - // Create the webview + + // Create the webview: WX_WEBVIEW_BACKEND environment variable allows to + // select the backend to use if there is more than one available. + wxString backend; + if ( !wxGetEnv("WX_WEBVIEW_BACKEND", &backend) ) + backend = wxWebViewBackendDefault; +#if wxUSE_WEBVIEW_CHROMIUM + // Allow specifying shorter "CEF" instead of having to type the full class + // name. + // + // Note that this is more than just a minor convenience: this also ensures + // that we reference wxWebViewBackendChromium from this file and this means + // that MSVC linker keeps wxWebViewChromium code when using static + // libraries while without it, it could discard it completely and it + // wouldn't be available during run-time at all. + else if ( backend.CmpNoCase("cef") ) + backend = wxWebViewBackendChromium; +#endif // wxUSE_WEBVIEW_CHROMIUM + + if ( backend != wxWebViewBackendDefault && + !wxWebView::IsBackendAvailable(backend) ) + { + wxLogWarning("Requested backend \"%s\" is not available, using default " + "backend instead.", backend); + backend = wxWebViewBackendDefault; + } + m_browser = (windowFeatures) ? windowFeatures->GetChildWebView() - : wxWebView::New( -#ifdef wxWEBVIEW_SAMPLE_CHROMIUM - wxWebViewBackendChromium -#endif - ); + : wxWebView::New(backend); + if ( !m_browser ) + { + wxLogFatalError("Failed to create wxWebView object using \"%s\" backend", backend); + } // With several backends the proxy can only be set before creation, so do // it here if the standard environment variable is defined. diff --git a/samples/webview/webview_chromium.vcxproj b/samples/webview/webview.vcxproj similarity index 87% rename from samples/webview/webview_chromium.vcxproj rename to samples/webview/webview.vcxproj index 6fad08c2e5..21c223ed4c 100644 --- a/samples/webview/webview_chromium.vcxproj +++ b/samples/webview/webview.vcxproj @@ -150,7 +150,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -187,7 +187,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -228,7 +228,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -265,7 +265,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -306,7 +306,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -343,7 +343,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -384,7 +384,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -421,7 +421,7 @@ .\..\..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) - libcef.lib;libcef_dll_wrapper.lib;$(wxToolkitLibNamePrefix)webviewchromium.lib;$(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) + $(wxToolkitLibNamePrefix)webview.lib;$(wxToolkitLibNamePrefix)stc.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregexu$(wxSuffixDebug).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;wxlexilla$(wxSuffixDebug).lib;%(AdditionalDependencies) true .\..\..\lib\$(wxOutDirName);..\..\3rdparty\cef\$(Configuration);%(AdditionalLibraryDirectories) true @@ -446,4 +446,4 @@ - \ No newline at end of file + diff --git a/src/common/webview_chromium.cpp b/src/common/webview_chromium.cpp index b216a8fc2f..63c1ad8c5f 100644 --- a/src/common/webview_chromium.cpp +++ b/src/common/webview_chromium.cpp @@ -68,7 +68,7 @@ constexpr const char* TRACE_CEF = "cef"; } // anonymous namespace -extern WXDLLIMPEXP_DATA_WEBVIEW_CHROMIUM(const char) wxWebViewBackendChromium[] = "wxWebViewChromium"; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendChromium[] = "wxWebViewChromium"; bool wxWebViewChromium::ms_cefInitialized = false; @@ -1452,7 +1452,7 @@ wxWebViewChromiumEntry gs_chromiumEntryHook; } // anonymous namespace -class WXDLLIMPEXP_WEBVIEW_CHROMIUM wxWebViewFactoryChromium : public wxWebViewFactory +class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryChromium : public wxWebViewFactory { public: virtual wxWebView* Create() override { return new wxWebViewChromium; } diff --git a/src/msw/version.rc b/src/msw/version.rc index 99174d4f30..9e3696bf8f 100644 --- a/src/msw/version.rc +++ b/src/msw/version.rc @@ -63,8 +63,6 @@ #define WXLIBDESC "styled text" #elif defined WXMAKINGDLL_WEBVIEW #define WXLIBDESC "webview" -#elif defined WXMAKINGDLL_WEBVIEW_CHROMIUM - #define WXLIBDESC "webview_chromium" #elif defined WXMAKINGDLL #define WXLIBDESC "monolithic" #else diff --git a/src/osx/webview_chromium.mm b/src/osx/webview_chromium.mm index 8435fed950..3a4e36ac23 100644 --- a/src/osx/webview_chromium.mm +++ b/src/osx/webview_chromium.mm @@ -9,6 +9,8 @@ #include "wx/webview_chromium.h" +#if wxUSE_WEBVIEW_CHROMIUM + #import "Cocoa/Cocoa.h" #include #include "wx/log.h" @@ -83,3 +85,5 @@ void wxWebViewChromium_Resize(cef_window_handle_t handle, wxSize size) [view setFrame:wxToNSRect([view superview], size)]; } + +#endif // wxUSE_WEBVIEW_CHROMIUM