diff options
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 49 |
1 files changed, 13 insertions, 36 deletions
diff --git a/base/base.gypi b/base/base.gypi index ea23a8e..79bff9b 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -535,13 +535,25 @@ },], [ 'component=="shared_library"', { 'defines': [ + 'BASE_DLL', 'BASE_IMPLEMENTATION', ], 'conditions': [ ['OS=="win"', { + 'msvs_disabled_warnings': [ + 4251, + ], 'sources!': [ 'debug/debug_on_start_win.cc', ], + 'direct_dependent_settings': { + 'defines': [ + 'BASE_DLL', + ], + 'msvs_disabled_warnings': [ + 4251, + ], + }, }], ], }], @@ -593,7 +605,7 @@ 'targets': [ { 'target_name': 'base_nacl_win64', - 'type': '<(component)', + 'type': 'static_library', 'variables': { 'base_target': 1, }, @@ -619,41 +631,6 @@ 'msvs_target_platform': 'x64', }, }, - 'conditions': [ - [ 'component == "shared_library"', { - 'defines': [ - 'BASE_IMPLEMENTATION', - ], - 'sources!': [ - 'debug/debug_on_start_win.cc', - ], - }], - ], - }, - { - 'target_name': 'base_i18n_nacl_win64', - 'type': 'static_library', - # TODO(gregoryd): direct_dependent_settings should be shared with the - # 32-bit target, but it doesn't work due to a bug in gyp - 'direct_dependent_settings': { - 'include_dirs': [ - '..', - ], - }, - 'defines': [ - '<@(nacl_win64_defines)', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'i18n/icu_util_nacl_win64.cc', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, }, ], }], |