From bb4aac2534d349f25ca64b886efc217aeb2f0245 Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Mon, 4 Aug 2014 18:37:16 +0800
Subject: [PATCH] [Mac] Move mac related resource files to mac directory.

---
 build/bakefiles/config.bkl                                    | 2 +-
 samples/webview_chromium/{ => mac}/helper-Info.plist          | 0
 .../webview_chromium/{ => mac}/webview_chromium-Info.plist    | 0
 samples/webview_chromium/webview_chromium.bkl                 | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename samples/webview_chromium/{ => mac}/helper-Info.plist (100%)
 rename samples/webview_chromium/{ => mac}/webview_chromium-Info.plist (100%)

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 349f2ad554..0dcb3c3ddd 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -601,7 +601,7 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
 
     <set var="LIBCEF_FRAMEWORK">
         <if cond="PLATFORM_MACOSX=='1'">
-            -F$(TOP_SRCDIR)src/cef/Release/ -framework Chromium\ Embedded\ framework
+            -F$(TOP_SRCDIR)src/cef/Release/ -framework Chromium\ Embedded\ Framework
         </if>
     </set>
 
diff --git a/samples/webview_chromium/helper-Info.plist b/samples/webview_chromium/mac/helper-Info.plist
similarity index 100%
rename from samples/webview_chromium/helper-Info.plist
rename to samples/webview_chromium/mac/helper-Info.plist
diff --git a/samples/webview_chromium/webview_chromium-Info.plist b/samples/webview_chromium/mac/webview_chromium-Info.plist
similarity index 100%
rename from samples/webview_chromium/webview_chromium-Info.plist
rename to samples/webview_chromium/mac/webview_chromium-Info.plist
diff --git a/samples/webview_chromium/webview_chromium.bkl b/samples/webview_chromium/webview_chromium.bkl
index 29939843d5..fd22720162 100644
--- a/samples/webview_chromium/webview_chromium.bkl
+++ b/samples/webview_chromium/webview_chromium.bkl
@@ -13,7 +13,7 @@
             <include>$(CEF_INCLUDE_DIR)</include>
             <sys-lib>$(LIBCEF_NAME)</sys-lib>
             <sys-lib>$(LIBCEF_DLL_WRAPPER_NAME)</sys-lib>
-            <ldflags>-F$(TOP_SRCDIR)/src/cef/Release/ -framework Chromium\ Embedded\ framework</ldflags>
+            <ldflags>-F$(TOP_SRCDIR)/src/cef/Release/ -framework Chromium\ Embedded\ Framework</ldflags>
         </if>
         <add-target target="fix_cef_link" type="action"
                     cond="target and PLATFORM_MACOSX=='1'">
@@ -24,7 +24,7 @@
                 mkdir -p webview_chromium_helper.app/Contents/MacOS
                 mkdir -p webview_chromium_helper.app/Contents/Resources
                 sed -e "s/\$${PRODUCT_NAME}/webview_chromium Helper/"  \
-                    -e "s/\$${EXECUTABLE_NAME}/webview_chromium Helper/"  helper-Info.plist >webview_chromium_helper.app/Contents/Info.plist
+                    -e "s/\$${EXECUTABLE_NAME}/webview_chromium Helper/"  mac/helper-Info.plist >webview_chromium_helper.app/Contents/Info.plist
                 /bin/echo "APPL????" >webview_chromium_helper.app/Contents/PkgInfo
                 <!--Fix CEF link path -->
                 install_name_tool -change "@executable_path/Chromium Embedded Framework" "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" webview_chromium_helper