Build system fixes for wxWebViewChromium.

This commit is contained in:
Steven Lamerton 2014-10-19 09:05:39 +01:00 committed by Tobias Taschner
parent 8a0bb51f80
commit 0347008aa3
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
9 changed files with 30 additions and 15 deletions

View file

@ -56,6 +56,11 @@
autoconf,borland,dmars_smake,dmars,mingw,watcom
</del-formats>
<!-- wxWebViewChromium supports only a subset of the compilers -->
<del-formats files="../../samples/webview_chromium/webview_chromium.bkl">
borland,mingw,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
</del-formats>
<!-- Default flags (for all formats and bakefiles): -->
<add-flags>-Iformats</add-flags>
@ -234,7 +239,7 @@
<add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
gnu
</add-formats>
<del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
<del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/webview_chromium/webview_chromium.bkl">
gnu
</del-formats>
<add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"

View file

@ -48,6 +48,7 @@
@echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
@echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
@echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
@echo USE_WEBVIEW_CHROMIUM=$(USE_WEBVIEW_CHROMIUM) >>$(BUILD_CFG_FILE)
@echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
@echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)

View file

@ -184,6 +184,9 @@
<set var="WXLIB_WEBVIEW">
<if cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
</set>
<set var="WXLIB_WEBVIEW_CHROMIUM">
<if cond="MONOLITHIC=='0' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT=='autoconf'">$(mk.evalExpr(wxwin.mkLibName('webview_chromium')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>

View file

@ -197,8 +197,7 @@
<wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
<dll id="webviewchromiumdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0'">
<define>wxUSE_WEBVIEW_CHROMIUM=1</define>
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0' and FORMAT=='autoconf'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_WEBVIEW_CHROMIUM</define>
<sources>$(WEBVIEWCHROMIUM_SRC)</sources>
@ -215,17 +214,13 @@
</dll>
<lib id="webviewchromiumlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0'">
<define>wxUSE_WEBVIEW_CHROMIUM=1</define>
cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW_CHROMIUM=='1' and MONOLITHIC=='0' and FORMAT=='autoconf'">
<sources>$(WEBVIEWCHROMIUM_SRC)</sources>
<msvc-headers>$(WEBVIEWCHROMIUM_HDR)</msvc-headers>
<include>$(CEF_INCLUDE_DIR)</include>
</lib>
<wxshortcut id="wxwebviewchromium" cond="MONOLITHIC=='0' and USE_WEBVIEW_CHROMIUM=='1'"/>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webviewchromium=webviewchromiumlib+webviewchromiumdll</set>
<wxshortcut id="wxwebviewchromium" cond="MONOLITHIC=='0' and USE_WEBVIEW_CHROMIUM=='1' and FORMAT=='autoconf'"/>
<!-- ================================================================ -->
<!-- OpenGL -->

View file

@ -88,6 +88,7 @@
NOTE: as a reference here is a list of all wxWidgets libraries satisfying
the dependency constraints mentioned in <wx-lib> description:
<wx-lib>webview_chromium</wx-lib>
<wx-lib>webview</wx-lib>
<wx-lib>richtext</wx-lib>
<wx-lib>aui</wx-lib>
@ -124,7 +125,7 @@
tag definitions.
-->
<set var="WX_LIB_LIST">
base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview
base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview webview_chromium
</set>
<!-- if you define this variable to 0 before including wx presets, the

View file

@ -169,6 +169,7 @@
<define-wxlib-name>stc</define-wxlib-name>
<define-wxlib-name>richtext</define-wxlib-name>
<define-wxlib-name>webview</define-wxlib-name>
<define-wxlib-name>webview_chromium</define-wxlib-name>
<!-- NOTE: The GL lib is not part of the monolithic build; treat it as a contrib! -->
@ -210,6 +211,7 @@
<if cond="value=='propgrid'"><sys-lib>$(WXLIB_PROPGRID_NAME)</sys-lib></if>
<if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
<if cond="value=='webview'"><sys-lib>$(WXLIB_WEBVIEW_NAME)</sys-lib></if>
<if cond="value=='webview_chromium'"><sys-lib>$(WXLIB_WEBVIEW_CHROMIUM_NAME)</sys-lib></if>
<!-- The GL lib isn't part of the monolithic build, treat it as a contrib: -->
<if cond="value=='gl'">

View file

@ -39,11 +39,13 @@ 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']
'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc',
'webview_chromium']
# 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']
'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview',
'webview_chromium']
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',

View file

@ -89,7 +89,6 @@
<subproject id="validate" template="sub"/>
<subproject id="vscroll" template="sub"/>
<subproject id="webview" template="sub" cond="USE_STC=='1'"/>
<subproject id="webview_chromium" template="sub"/>
<subproject id="widgets" template="sub"/>
<subproject id="wizard" template="sub"/>
<subproject id="wrapsizer" template="sub"/>
@ -108,4 +107,12 @@
</if>
<subproject id="memcheck" template="optsub"/>
<!--
Chromium does not build with older versions of Visual Studio so don't
build the sample either.
-->
<if cond="FORMAT[:3] != 'msv'">
<subproject id="webview_chromium" template="optsub"/>
</if>
</makefile>

View file

@ -44,9 +44,8 @@
<sources>
webview.cpp
</sources>
<define>wxUSE_WEBVIEW_CHROMIUM=1</define>
<wx-lib>webview_chromium</wx-lib>
<wx-lib>webview</wx-lib>
<wx-lib>webviewchromium</wx-lib>
<wx-lib>stc</wx-lib>
<wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib>