Chromium Code Reviews| Index: tools/gyp/v8.gyp |
| =================================================================== |
| --- tools/gyp/v8.gyp (revision 7688) |
| +++ tools/gyp/v8.gyp (working copy) |
| @@ -187,19 +187,32 @@ |
| { |
| 'dependencies': ['v8_nosnapshot'], |
| }], |
| - ['OS=="win" and component=="shared_library"', { |
| + ['component=="shared_library"', { |
| 'type': '<(component)', |
| 'sources': [ |
|
Søren Thygesen Gjesse
2011/04/29 06:21:42
So the GYP issue is that you cannot just exclude t
Evan Martin
2011/04/29 21:17:09
OK.
|
| '../../src/v8dll-main.cc', |
| ], |
| - 'defines': [ |
| - 'BUILDING_V8_SHARED' |
| + 'conditions': [ |
| + ['OS=="win"', { |
| + 'defines': [ |
| + 'BUILDING_V8_SHARED', |
| + ], |
| + 'direct_dependent_settings': { |
| + 'defines': [ |
| + 'USING_V8_SHARED', |
| + ], |
| + }, |
| + }, { |
| + 'defines': [ |
| + 'V8_SHARED', |
| + ], |
| + 'direct_dependent_settings': { |
| + 'defines': [ |
| + 'V8_SHARED', |
| + ], |
| + }, |
| + }], |
| ], |
| - 'direct_dependent_settings': { |
| - 'defines': [ |
| - 'USING_V8_SHARED', |
| - ], |
| - }, |
| }, |
| { |
| 'type': 'none', |
| @@ -215,9 +228,27 @@ |
| 'target_name': 'v8_snapshot', |
| 'type': '<(library)', |
| 'conditions': [ |
| - ['OS=="win" and component=="shared_library"', { |
| - 'defines': [ |
| - 'BUILDING_V8_SHARED', |
| + ['component=="shared_library"', { |
| + 'conditions': [ |
| + ['OS=="win"', { |
| + 'defines': [ |
| + 'BUILDING_V8_SHARED', |
| + ], |
| + 'direct_dependent_settings': { |
| + 'defines': [ |
| + 'USING_V8_SHARED', |
| + ], |
| + }, |
| + }, { |
| + 'defines': [ |
| + 'V8_SHARED', |
| + ], |
| + 'direct_dependent_settings': { |
| + 'defines': [ |
| + 'V8_SHARED', |
| + ], |
| + }, |
| + }], |
| ], |
| }], |
| ], |
| @@ -270,9 +301,10 @@ |
| 'cflags': ['-m32'], |
| 'ldflags': ['-m32'], |
| }], |
| - ['OS=="win" and component=="shared_library"', { |
| + ['component=="shared_library"', { |
| 'defines': [ |
| 'BUILDING_V8_SHARED', |
| + 'V8_SHARED', |
| ], |
| }], |
| ] |
| @@ -695,9 +727,10 @@ |
| 'libraries': [ '-lwinmm.lib' ], |
| }, |
| }], |
| - ['OS=="win" and component=="shared_library"', { |
| + ['component=="shared_library"', { |
| 'defines': [ |
| - 'BUILDING_V8_SHARED' |
| + 'BUILDING_V8_SHARED', |
| + 'V8_SHARED', |
| ], |
| }], |
| ], |