Skip to content

V
V8
Commit 266c17e5 authored by yangguo@chromium.org's avatar yangguo@chromium.org
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 40 deletions
src/d8.cc
View file @ 266c17e5
...@@ -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
......
tools/gyp/v8.gyp
View file @ 266c17e5
...@@ -58,31 +58,22 @@ ...@@ -58,31 +58,22 @@
# has some sources to link into the component. # has some sources to link into the component.
'../../src/v8dll-main.cc', '../../src/v8dll-main.cc',
], ],
'defines': [
'V8_SHARED',
'BUILDING_V8_SHARED',
],
'direct_dependent_settings': {
'defines': [
'V8_SHARED',
'USING_V8_SHARED',
],
},
'conditions': [ 'conditions': [
['OS=="mac"', { ['OS=="mac"', {
'xcode_settings': { 'xcode_settings': {
'OTHER_LDFLAGS': ['-dynamiclib', '-all_load'] 'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']
}, },
}], }],
['OS=="win"', {
'defines': [
'BUILDING_V8_SHARED',
],
'direct_dependent_settings': {
'defines': [
'USING_V8_SHARED',
],
},
}, {
'defines': [
'V8_SHARED',
],
'direct_dependent_settings': {
'defines': [
'V8_SHARED',
],
},
}],
['soname_version!=""', { ['soname_version!=""', {
'product_extension': 'so.<(soname_version)', 'product_extension': 'so.<(soname_version)',
}], }],
...@@ -110,27 +101,16 @@ ...@@ -110,27 +101,16 @@
'dependencies': ['mksnapshot', 'js2c'], 'dependencies': ['mksnapshot', 'js2c'],
}], }],
['component=="shared_library"', { ['component=="shared_library"', {
'conditions': [ 'defines': [
['OS=="win"', { 'V8_SHARED',
'defines': [ 'BUILDING_V8_SHARED',
'BUILDING_V8_SHARED',
],
'direct_dependent_settings': {
'defines': [
'USING_V8_SHARED',
],
},
}, {
'defines': [
'V8_SHARED',
],
'direct_dependent_settings': {
'defines': [
'V8_SHARED',
],
},
}],
], ],
'direct_dependent_settings': {
'defines': [
'V8_SHARED',
'USING_V8_SHARED',
],
},
}], }],
], ],
'dependencies': [ 'dependencies': [
......
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