Add support for WebKit2GTK+ in wxWebView
This commit is contained in:
committed by
Steven Lamerton
parent
d10c600773
commit
cbe0a1f049
@@ -417,6 +417,7 @@ to run the tests, include CppUnit library here.
|
||||
<option name="DYLIB_RPATH_POSTLINK"/>
|
||||
<option name="SAMPLES_RPATH_FLAG"/>
|
||||
<option name="SAMPLES_CXXFLAGS"/>
|
||||
<option name="USE_WEBVIEW_WEBKIT2"/>
|
||||
|
||||
<!-- see configure.in; it's required by some samples on Mac OS X -->
|
||||
<option name="HEADER_PAD_OPTION"/>
|
||||
|
@@ -3095,6 +3095,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<set var="WEBVIEW_SRC_PLATFORM">
|
||||
<if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
|
||||
<if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>
|
||||
<if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit2.cpp</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
|
||||
</set>
|
||||
<set var="WEBVIEW_CMN_SRC" hints="files">
|
||||
@@ -3132,6 +3133,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
$(WEBVIEW_CMN_HDR)
|
||||
</set>
|
||||
|
||||
<set var="WEBVIEW_WEBKIT2_EXTENSION_SRC" hints="files">
|
||||
src/gtk/webview_webkit2_extension.cpp
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- wxXRC -->
|
||||
<!-- ====================================================================== -->
|
||||
|
@@ -180,6 +180,7 @@
|
||||
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_WEBVIEW</define>
|
||||
<define>WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"</define>
|
||||
<sources>$(WEBVIEW_SRC)</sources>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
|
@@ -11,5 +11,10 @@
|
||||
<ldlibs>$(EXTRALIBS_SDL)</ldlibs>
|
||||
</wx-base-plugin>
|
||||
|
||||
<wx-base-plugin id="webkit2_ext" cond="USE_WEBVIEW_WEBKIT2=='1'">
|
||||
<sources>$(WEBVIEW_WEBKIT2_EXTENSION_SRC)</sources>
|
||||
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
|
||||
<install-to>$(PLUGINS_INST_DIR)/web-extensions</install-to>
|
||||
</wx-base-plugin>
|
||||
|
||||
</makefile>
|
||||
|
Reference in New Issue
Block a user