solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Move CEF specific variables to config.bkl to avoid duplicate.

Browse source
This commit is contained in:
Haojian Wu 2014-05-30 00:08:41 +08:00 • committed by Tobias Taschner
parent 3a4d793579
commit 0efb04d342
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
3 changed files with 28 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

22
build/bakefiles/config.bkl
View file

@ -545,4 +545,26 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
<set var="USE_OPENGL">0</set>
</if>
<!--Add CEF directory here-->
<set var="CEF_INCLUDE_DIR">
</set>
<set var="CONFIGURE" >
<if cond="BUILD=='debug'">Debug</if>
<if cond="BUILD=='release'">Release</if>
</set>
<!--specify CEF lib dir-->
<set var="CEF_LIB_DIR">
<if cond="PLATFORM_WIN32=='1'">
$(CEF_INCLUDE_DIR)/$(CONFIGURE)/,$(CEF_INCLUDE_DIR)/out/$(CONFIGURE)/lib/
</if>
<if cond="PLATFORM_MACOSX=='1'">
<!--TODO -->
</if>
<if cond="PLATFORM_UNIX=='1'">
<!--TODO -->
</if>
</set>
</makefile>

22
build/bakefiles/files.bkl
View file

@ -3098,28 +3098,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxWEBVIEW -->
<!-- ====================================================================== -->
<!--Add CEF directory here-->
<set var="CEF_INCLUDE_DIR">
</set>
<set var="CONFIGURE" >
<if cond="BUILD=='debug'">Debug</if>
<if cond="BUILD=='release'">Release</if>
</set>
<!--specify CEF lib dir-->
<set var="CEF_LIB_DIR">
<if cond="PLATFORM_WIN32=='1'">
$(CEF_INCLUDE_DIR)/$(CONFIGURE)/,$(CEF_INCLUDE_DIR)/out/$(CONFIGURE)/lib/
</if>
<if cond="PLATFORM_MACOSX=='1'">
<!--TODO -->
</if>
<if cond="PLATFORM_UNIX=='1'">
<!--TODO -->
</if>
</set>
<set var="WEBVIEW_SRC_PLATFORM">
<if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
<if cond="TOOLKIT=='GTK'">

32
samples/webview_chromium/webview_chromium.bkl
View file

@ -3,28 +3,6 @@
<include file="../../build/bakefiles/common_samples.bkl"/>
<!--specify CEF head files include dir -->
<set var="CEF_INCLUDE_DIR">
</set>
<set var="CONFIGURE" >
<if cond="BUILD=='debug'">Debug</if>
<if cond="BUILD=='release'">Release</if>
</set>
<!--specify CEF lib dir-->
<set var="CEF_LIB_DIR">
<if cond="PLATFORM_WIN32=='1'">
$(CEF_INCLUDE_DIR)/$(CONFIGURE)/,$(CEF_INCLUDE_DIR)/out/$(CONFIGURE)/lib/
</if>
<if cond="PLATFORM_MACOSX=='1'">
<!--TODO -->
</if>
<if cond="PLATFORM_UNIX=='1'">
<!--TODO -->
</if>
</set>
<exe id="webview_chromium" template="wx_sample" template_append="wx_append">
<sources>
webview.cpp
@ -35,10 +13,12 @@
<wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<lib-path>$(CEF_LIB_DIR)</lib-path>
<include>$(CEF_INCLUDE_DIR)</include>
<sys-lib>libcef</sys-lib>
<sys-lib>libcef_dll_wrapper</sys-lib>
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
<lib-path>$(CEF_LIB_DIR)</lib-path>
<include>$(CEF_INCLUDE_DIR)</include>
<sys-lib>libcef</sys-lib>
<sys-lib>libcef_dll_wrapper</sys-lib>
</if>
<win32-res>../sample.rc</win32-res>
<if cond="OUT_OF_TREE_MAKEFILES=='0'">