Only link webview library with libwebkitgtk in wxGTK, not the core one.
Add EXTRALIBS_WEBVIEW similar to the existing EXTRALIBS_MEDIA and such and set it in configure instead of adding libwebkitgtk and dependent libraries directly to GUI_TK_LIBRARY. This ensure that the core library doesn't have any dependencies on libwebkitgtk which it doesn't need. Closes #16624. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -410,6 +410,7 @@ to run the tests, include CppUnit library here.
|
||||
<option name="EXTRALIBS_GUI"/>
|
||||
<option name="EXTRALIBS_OPENGL"/>
|
||||
<option name="EXTRALIBS_SDL"/>
|
||||
<option name="EXTRALIBS_WEBVIEW"/>
|
||||
<option name="CXXWARNINGS"/>
|
||||
<option name="HOST_SUFFIX"/>
|
||||
<option name="DYLIB_RPATH_INSTALL"/>
|
||||
@@ -492,6 +493,7 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
|
||||
</set>
|
||||
<set var="EXTRALIBS_SDL"/>
|
||||
<set var="EXTRALIBS_WEBVIEW"/>
|
||||
|
||||
<set var="WITH_PLUGIN_SDL">0</set>
|
||||
|
||||
|
@@ -26,6 +26,7 @@
|
||||
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
|
||||
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
|
||||
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
|
||||
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
|
||||
<library>$(wxscintilla_library_link)</library>
|
||||
</dll>
|
||||
|
||||
|
@@ -183,6 +183,7 @@
|
||||
<sources>$(WEBVIEW_SRC)</sources>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
|
||||
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
|
||||
</dll>
|
||||
|
||||
|
@@ -51,6 +51,7 @@ EXTRALIBS = {
|
||||
'html' : '$(EXTRALIBS_HTML)',
|
||||
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
|
||||
'media' : '$(EXTRALIBS_MEDIA)',
|
||||
'webview' : '$(EXTRALIBS_WEBVIEW)',
|
||||
}
|
||||
|
||||
def mkLibName(wxid):
|
||||
|
Reference in New Issue
Block a user