From 0efb04d342d4b0cf7b8ef43bd18fe0eae6b9b6f2 Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Fri, 30 May 2014 00:08:41 +0800
Subject: [PATCH] Move CEF specific variables to config.bkl to avoid duplicate.

---
 build/bakefiles/config.bkl                    | 22 +++++++++++++
 build/bakefiles/files.bkl                     | 22 -------------
 samples/webview_chromium/webview_chromium.bkl | 32 ++++---------------
 3 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index ad06b70a0b..013a3eef45 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -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>
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c986308fbb..a8b5f77812 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -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'">
diff --git a/samples/webview_chromium/webview_chromium.bkl b/samples/webview_chromium/webview_chromium.bkl
index 6215b12f8c..a4452cd853 100644
--- a/samples/webview_chromium/webview_chromium.bkl
+++ b/samples/webview_chromium/webview_chromium.bkl
@@ -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'">