Limit the use of "webkit2_ext" to autoconf only in bakefiles
This is used by WebKit2 backend under Unix with configure, but is not needed under the other platforms and prevented bakefile_gen from generating all output files due to the of undefined USE_WEBVIEW_WEBKIT2 variable. We could define it for formats other than autoconf, but this doesn't seem to be useful currently, so just avoid referencing it instead. Closes #17860.
This commit is contained in:
16
Makefile.in
16
Makefile.in
@@ -1663,15 +1663,14 @@ WEBVIEWDLL_CXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \
|
|||||||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
|
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
|
||||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||||
$(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
|
$(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
|
||||||
-DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" \
|
$(__webviewdll_ext_dir_define_p) $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
|
||||||
$(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
|
$(CXXFLAGS)
|
||||||
WEBVIEWDLL_OBJCXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \
|
WEBVIEWDLL_OBJCXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \
|
||||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
||||||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
|
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
|
||||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||||
$(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
|
$(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
|
||||||
-DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" \
|
$(__webviewdll_ext_dir_define_p) $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
|
||||||
$(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
|
|
||||||
WEBVIEWDLL_OBJECTS = \
|
WEBVIEWDLL_OBJECTS = \
|
||||||
$(__webviewdll___win32rc) \
|
$(__webviewdll___win32rc) \
|
||||||
$(__WEBVIEW_SRC_PLATFORM_OBJECTS_2) \
|
$(__WEBVIEW_SRC_PLATFORM_OBJECTS_2) \
|
||||||
@@ -12427,6 +12426,12 @@ COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \
|
|||||||
COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \
|
COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \
|
||||||
$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
|
$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(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_USE_SOVERSOLARIS_1@__webviewdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd)
|
||||||
|
@COND_USE_WEBVIEW_WEBKIT2_1@__webviewdll_ext_dir_define_p \
|
||||||
|
@COND_USE_WEBVIEW_WEBKIT2_1@ = \
|
||||||
|
@COND_USE_WEBVIEW_WEBKIT2_1@ -DWX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"
|
||||||
|
@COND_USE_WEBVIEW_WEBKIT2_1@__webviewdll_ext_dir_define_p_1 \
|
||||||
|
@COND_USE_WEBVIEW_WEBKIT2_1@ = --define \
|
||||||
|
@COND_USE_WEBVIEW_WEBKIT2_1@ WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"
|
||||||
@COND_PLATFORM_WIN32_1@__webviewdll___win32rc = webviewdll_version_rc.o
|
@COND_PLATFORM_WIN32_1@__webviewdll___win32rc = webviewdll_version_rc.o
|
||||||
@COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 \
|
@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_webkit.o
|
||||||
@@ -34428,7 +34433,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
|
|||||||
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
|
@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)
|
webviewdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWDLL_ODEP)
|
||||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW --define WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"
|
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW $(__webviewdll_ext_dir_define_p_1)
|
||||||
|
|
||||||
webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP)
|
webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP)
|
||||||
$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
|
$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
|
||||||
@@ -35309,6 +35314,7 @@ sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
|
|||||||
webkit2_ext_webview_webkit2_extension.o: $(srcdir)/src/gtk/webview_webkit2_extension.cpp
|
webkit2_ext_webview_webkit2_extension.o: $(srcdir)/src/gtk/webview_webkit2_extension.cpp
|
||||||
$(CXXC) -c -o $@ $(WEBKIT2_EXT_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2_extension.cpp
|
$(CXXC) -c -o $@ $(WEBKIT2_EXT_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2_extension.cpp
|
||||||
|
|
||||||
|
|
||||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||||
|
@@ -176,11 +176,15 @@
|
|||||||
<!-- wxWEBVIEW -->
|
<!-- wxWEBVIEW -->
|
||||||
<!-- ================================================================ -->
|
<!-- ================================================================ -->
|
||||||
|
|
||||||
|
<set var="webviewdll_ext_dir_define">
|
||||||
|
<if cond="FORMAT=='autoconf' and USE_WEBVIEW_WEBKIT2=='1'">WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
<dll id="webviewdll" template="wx_dll"
|
<dll id="webviewdll" template="wx_dll"
|
||||||
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
|
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
|
||||||
<define>WXUSINGDLL</define>
|
<define>WXUSINGDLL</define>
|
||||||
<define>WXMAKINGDLL_WEBVIEW</define>
|
<define>WXMAKINGDLL_WEBVIEW</define>
|
||||||
<define>WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"</define>
|
<define>$(webviewdll_ext_dir_define)</define>
|
||||||
<sources>$(WEBVIEW_SRC)</sources>
|
<sources>$(WEBVIEW_SRC)</sources>
|
||||||
<library>coredll</library>
|
<library>coredll</library>
|
||||||
<library>basedll</library>
|
<library>basedll</library>
|
||||||
|
@@ -11,10 +11,12 @@
|
|||||||
<ldlibs>$(EXTRALIBS_SDL)</ldlibs>
|
<ldlibs>$(EXTRALIBS_SDL)</ldlibs>
|
||||||
</wx-base-plugin>
|
</wx-base-plugin>
|
||||||
|
|
||||||
|
<if cond="FORMAT=='autoconf'">
|
||||||
<wx-base-plugin id="webkit2_ext" cond="USE_WEBVIEW_WEBKIT2=='1'">
|
<wx-base-plugin id="webkit2_ext" cond="USE_WEBVIEW_WEBKIT2=='1'">
|
||||||
<sources>$(WEBVIEW_WEBKIT2_EXTENSION_SRC)</sources>
|
<sources>$(WEBVIEW_WEBKIT2_EXTENSION_SRC)</sources>
|
||||||
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
|
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
|
||||||
<install-to>$(PLUGINS_INST_DIR)/web-extensions</install-to>
|
<install-to>$(PLUGINS_INST_DIR)/web-extensions</install-to>
|
||||||
</wx-base-plugin>
|
</wx-base-plugin>
|
||||||
|
</if>
|
||||||
|
|
||||||
</makefile>
|
</makefile>
|
||||||
|
Reference in New Issue
Block a user