From 5e807cffc87f0f90ddee67cf11ecdbea1f2075bb Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 2 Jul 2013 15:12:34 +0800
Subject: [PATCH] Use abusolute path when linking to external libraries. Fixes
 #22.

The ninja generator of gyp behaves strangely on the 'libraries' field of link
settings, for example, specifying path to an external library works well on
both xcodebuild and msvc generators, but the ninja generator would link to
the wrong path (it can neither translate relative path correctly, nor convert
the command line parameter to the '-lxxx' form).

The only way to make all generators work on all platforms is to use abusolute
paths for external libraries.
---
 brightray/brightray.gyp                  | 11 +++++++----
 brightray/tools/brightray_source_root.py |  9 +++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 brightray/tools/brightray_source_root.py

diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 71616f36a500..90759e731f32 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -2,6 +2,9 @@
   'includes': [
     'brightray.gypi',
   ],
+  'variables': {
+    'brightray_source_root': '<!(python tools/brightray_source_root.py)',
+  },
   'targets': [
     {
       'target_name': 'brightray',
@@ -70,7 +73,7 @@
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
-              'libchromiumcontent.dylib',
+              '<(brightray_source_root)/<(libchromiumcontent_library_dir)/libchromiumcontent.dylib',
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
@@ -78,9 +81,9 @@
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
-              '<(libchromiumcontent_library_dir)/base_static.lib',
-              '<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
-              '<(libchromiumcontent_library_dir)/sandbox_static.lib',
+              '<(brightray_source_root)/<(libchromiumcontent_library_dir)/base_static.lib',
+              '<(brightray_source_root)/<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
+              '<(brightray_source_root)/<(libchromiumcontent_library_dir)/sandbox_static.lib',
             ],
           },
         }],
diff --git a/brightray/tools/brightray_source_root.py b/brightray/tools/brightray_source_root.py
new file mode 100644
index 000000000000..69f43cdc5eab
--- /dev/null
+++ b/brightray/tools/brightray_source_root.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+import os
+
+"""Prints the absolute path of the root of brightray's source tree.
+"""
+
+
+print os.path.abspath(os.path.dirname(os.path.dirname(__file__)))