From ea6bd5cfe5670d0db8d503ff19c9d9f2d58d84b0 Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Mon, 2 Jun 2014 07:05:14 -0700
Subject: [PATCH] Split CEF_LIB_DIR into LIBCEF_PATH and LIBCEF_WRAPPER_PATH.

---
 build/bakefiles/config.bkl                    | 23 +++++++++++++------
 build/bakefiles/multilib.bkl                  |  3 ++-
 samples/webview_chromium/webview_chromium.bkl |  3 ++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 8d83091d5c..036d0fce30 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -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>
 
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 912f8df421..374e66f4d3 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -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>
diff --git a/samples/webview_chromium/webview_chromium.bkl b/samples/webview_chromium/webview_chromium.bkl
index 36c412db44..fb6798ae09 100644
--- a/samples/webview_chromium/webview_chromium.bkl
+++ b/samples/webview_chromium/webview_chromium.bkl
@@ -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>