Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only link webview library with libwebkitgtk in wxGTK, not the core one.

Browse Source 
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:
Vadim Zeitlin
2014-10-16 13:33:08 +00:00
parent cf72b6c111
commit d24f711f88
7 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@@ -6992,7 +6992,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
[
USE_WEBVIEW_WEBKIT=1
CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
],
[
AC_MSG_WARN([webkitgtk not found.])
@@ -7738,6 +7738,7 @@ AC_SUBST(EXTRALIBS_GUI)
AC_SUBST(EXTRALIBS_OPENGL)
AC_SUBST(EXTRALIBS_SDL)
AC_SUBST(EXTRALIBS_STC)
AC_SUBST(EXTRALIBS_WEBVIEW)
AC_SUBST(WITH_PLUGIN_SDL)
AC_SUBST(UNICODE)
AC_SUBST(DEBUG_INFO)