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

Split CEF_LIB_DIR into LIBCEF_PATH and LIBCEF_WRAPPER_PATH.

Browse source
This commit is contained in:
Haojian Wu 2014-06-02 07:05:14 -07:00 • committed by Tobias Taschner
parent 04ddd87d3d
commit ea6bd5cfe5
No known key found for this signature in database
GPG key ID: AE6ECD71294F87FD
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
build/bakefiles/config.bkl
View file

@ -554,20 +554,29 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
<if cond="BUILD=='release'">Release</if>
</set>
<!--specify CEF lib dir-->
<set var="CEF_LIB_DIR">
<!--specify libcef library directory-->
<set var="LIBCEF_PATH">
<if cond="PLATFORM_WIN32=='1'">
$(CEF_INCLUDE_DIR)/$(CONFIGURE)/,$(CEF_INCLUDE_DIR)/out/$(CONFIGURE)/lib/
$(CEF_INCLUDE_DIR)/$(CONFIGURE)/
</if>
<if cond="PLATFORM_MACOSX=='1'">
<!--TODO -->
</if>
<!-- Since bakefile_gen will not add -L in the second link directory path(maybe a bug)
We add -L option explicitly as a temp solution. -->
<if cond="PLATFORM_UNIX=='1'">
$(CEF_INCLUDE_DIR)/Release/
-L$(CEF_INCLUDE_DIR)/out/Release/obj.target/
</if>
</set>
<!--specify libcef_dll_wrapper library directory-->
<set var="LIBCEF_WRAPPER_PATH">
<if cond="PLATFORM_WIN32=='1'">
$(CEF_INCLUDE_DIR)/out/$(CONFIGURE)/lib/
</if>
<if cond="PLATFORM_MACOSX=='1'">
<!--TODO -->
</if>
<if cond="PLATFORM_UNIX=='1'">
$(CEF_INCLUDE_DIR)/out/Release/obj.target/
</if>
</set>

3
build/bakefiles/multilib.bkl
View file

@ -187,7 +187,8 @@
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
<include>$(CEF_INCLUDE_DIR)</include>
<lib-path>$(CEF_LIB_DIR)</lib-path>
<lib-path>$(LIBCEF_PATH)</lib-path>
<lib-path>$(LIBCEF_WRAPPER_PATH)</lib-path>
<sys-lib>cef</sys-lib>
<sys-lib>cef_dll_wrapper</sys-lib>
</dll>

3
samples/webview_chromium/webview_chromium.bkl
View file

@ -14,7 +14,8 @@
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<if cond="OUT_OF_TREE_MAKEFILES=='0' and CEF_INCLUDE_DIR!=''">
<lib-path>$(CEF_LIB_DIR)</lib-path>
<lib-path>$(LIBCEF_PATH)</lib-path>
<lib-path>$(LIBCEF_WRAPPER_PATH)</lib-path>
<include>$(CEF_INCLUDE_DIR)</include>
<sys-lib>libcef</sys-lib>
<sys-lib>libcef_dll_wrapper</sys-lib>