From 736afb32a0c1ca6c8e30a3bc1ef1ffe2cd1297bb Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 2 Apr 2015 14:06:23 +0800 Subject: [PATCH] Link with component build shared libraries --- atom.gyp | 2 +- common.gypi | 6 +++--- vendor/brightray | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atom.gyp b/atom.gyp index 7ccdcf6daa..af0692dd95 100644 --- a/atom.gyp +++ b/atom.gyp @@ -878,8 +878,8 @@ { 'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Libraries', 'files': [ + '<@(libchromiumcontent_shared_libraries)', '<(libchromiumcontent_library_dir)/ffmpegsumo.so', - '<(libchromiumcontent_library_dir)/libchromiumcontent.dylib', '<(PRODUCT_DIR)/libnode.dylib', ], }, diff --git a/common.gypi b/common.gypi index d39d20ec45..7aaa4aa35f 100644 --- a/common.gypi +++ b/common.gypi @@ -110,17 +110,17 @@ 'conditions': [ ['OS=="linux"', { 'libraries': [ - '<(libchromiumcontent_library_dir)/libchromiumcontent.so', + '<(libchromiumcontent_library_dir)/libv8.so', ], }], ['OS=="win"', { 'libraries': [ - '<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib', + '<(libchromiumcontent_library_dir)/v8.dll.lib', ], }], ['OS=="mac"', { 'libraries': [ - '<(libchromiumcontent_library_dir)/libchromiumcontent.dylib', + '<(libchromiumcontent_library_dir)/libv8.dylib', ], }], ], diff --git a/vendor/brightray b/vendor/brightray index de08e6575b..a430d8f653 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit de08e6575b405c151f7941150c5c9a6bcf5d053c +Subproject commit a430d8f653602fd108094398b2ef79dc7126c819