Commit 266c17e5 authored by yangguo@chromium.org's avatar yangguo@chromium.org

Simplify v8.gyp.

Based on http://codereview.chromium.org/10310156

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10398057

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11586 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 6c6c7d80
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifdef USING_V8_SHARED // Defined when linking against shared lib on Windows. // Defined when linking against shared lib on Windows.
#if defined(USING_V8_SHARED) && !defined(V8_SHARED)
#define V8_SHARED #define V8_SHARED
#endif #endif
......
...@@ -58,29 +58,20 @@ ...@@ -58,29 +58,20 @@
# has some sources to link into the component. # has some sources to link into the component.
'../../src/v8dll-main.cc', '../../src/v8dll-main.cc',
], ],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']
},
}],
['OS=="win"', {
'defines': [ 'defines': [
'V8_SHARED',
'BUILDING_V8_SHARED', 'BUILDING_V8_SHARED',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'defines': [ 'defines': [
'V8_SHARED',
'USING_V8_SHARED', 'USING_V8_SHARED',
], ],
}, },
}, { 'conditions': [
'defines': [ ['OS=="mac"', {
'V8_SHARED', 'xcode_settings': {
], 'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']
'direct_dependent_settings': {
'defines': [
'V8_SHARED',
],
}, },
}], }],
['soname_version!=""', { ['soname_version!=""', {
...@@ -110,29 +101,18 @@ ...@@ -110,29 +101,18 @@
'dependencies': ['mksnapshot', 'js2c'], 'dependencies': ['mksnapshot', 'js2c'],
}], }],
['component=="shared_library"', { ['component=="shared_library"', {
'conditions': [
['OS=="win"', {
'defines': [
'BUILDING_V8_SHARED',
],
'direct_dependent_settings': {
'defines': [
'USING_V8_SHARED',
],
},
}, {
'defines': [ 'defines': [
'V8_SHARED', 'V8_SHARED',
'BUILDING_V8_SHARED',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'defines': [ 'defines': [
'V8_SHARED', 'V8_SHARED',
'USING_V8_SHARED',
], ],
}, },
}], }],
], ],
}],
],
'dependencies': [ 'dependencies': [
'v8_base', 'v8_base',
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment