| Index: base/base.gypi
|
| diff --git a/base/base.gypi b/base/base.gypi
|
| index 58089e9190dba0ad52faab62224c24433b40f3e9..58622dd68a958ef347d4a2eab739262506cc010e 100644
|
| --- a/base/base.gypi
|
| +++ b/base/base.gypi
|
| @@ -528,25 +528,29 @@
|
| 'win_util.cc',
|
| ],
|
| },],
|
| - [ 'OS=="win" and component=="shared_library"', {
|
| + [ 'component=="shared_library"', {
|
| 'defines': [
|
| 'BASE_DLL',
|
| 'BASE_IMPLEMENTATION=1',
|
| ],
|
| - 'msvs_disabled_warnings': [
|
| - 4251,
|
| - ],
|
| - 'sources!': [
|
| - 'debug/debug_on_start_win.cc',
|
| + 'conditions': [
|
| + ['OS=="win"', {
|
| + 'msvs_disabled_warnings': [
|
| + 4251,
|
| + ],
|
| + 'sources!': [
|
| + 'debug/debug_on_start_win.cc',
|
| + ],
|
| + 'direct_dependent_settings': {
|
| + 'defines': [
|
| + 'BASE_DLL',
|
| + ],
|
| + 'msvs_disabled_warnings': [
|
| + 4251,
|
| + ],
|
| + },
|
| + }],
|
| ],
|
| - 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'BASE_DLL',
|
| - ],
|
| - 'msvs_disabled_warnings': [
|
| - 4251,
|
| - ],
|
| - },
|
| }],
|
| ],
|
| 'sources': [
|
|
|