diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/at_exit.cc | 2 | ||||
| -rw-r--r-- | base/base.gypi | 49 | ||||
| -rw-r--r-- | base/base_api.h | 4 | ||||
| -rw-r--r-- | base/debug/debug_on_start_win.h | 4 | ||||
| -rw-r--r-- | base/logging.h | 2 |
5 files changed, 42 insertions, 19 deletions
diff --git a/base/at_exit.cc b/base/at_exit.cc index cafe75b..c7daad4 100644 --- a/base/at_exit.cc +++ b/base/at_exit.cc @@ -22,7 +22,7 @@ static AtExitManager* g_top_manager = NULL; AtExitManager::AtExitManager() : next_manager_(g_top_manager) { // If multiple modules instantiate AtExitManagers they'll end up living in this // module... they have to coexist. -#if !defined(BASE_DLL) +#if !defined(COMPONENT_BUILD) DCHECK(!g_top_manager); #endif g_top_manager = this; diff --git a/base/base.gypi b/base/base.gypi index 79bff9b..ea23a8e 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -535,25 +535,13 @@ },], [ '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, - ], - }, }], ], }], @@ -605,7 +593,7 @@ 'targets': [ { 'target_name': 'base_nacl_win64', - 'type': 'static_library', + 'type': '<(component)', 'variables': { 'base_target': 1, }, @@ -631,6 +619,41 @@ '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', + }, + }, }, ], }], diff --git a/base/base_api.h b/base/base_api.h index 2361659..deeae07 100644 --- a/base/base_api.h +++ b/base/base_api.h @@ -6,7 +6,7 @@ #define BASE_BASE_API_H_ #pragma once -#if defined(BASE_DLL) +#if defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(BASE_IMPLEMENTATION) @@ -19,7 +19,7 @@ #define BASE_API __attribute__((visibility("default"))) #endif -#else // defined(BASE_DLL) +#else // defined(COMPONENT_BUILD) #define BASE_API #endif diff --git a/base/debug/debug_on_start_win.h b/base/debug/debug_on_start_win.h index 4a5c120..86d4721 100644 --- a/base/debug/debug_on_start_win.h +++ b/base/debug/debug_on_start_win.h @@ -27,7 +27,7 @@ namespace debug { // There is no way for this code, as currently implemented, to work across DLLs. // TODO(rvargas): It looks like we really don't use this code, at least not for // Chrome. Figure out if it's really worth implementing something simpler. -#if !defined(BASE_DLL) +#if !defined(COMPONENT_BUILD) // Debug on start functions and data. class DebugOnStart { @@ -74,7 +74,7 @@ DECLSPEC_SELECTANY DebugOnStart::PIFV debug_on_start = &DebugOnStart::Init; #endif // _WIN64 -#endif // defined(BASE_DLL) +#endif // defined(COMPONENT_BUILD) } // namespace debug } // namespace base diff --git a/base/logging.h b/base/logging.h index 849de0e..d098937 100644 --- a/base/logging.h +++ b/base/logging.h @@ -469,7 +469,7 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) { } // MSVC doesn't like complex extern templates and DLLs. -#if !defined(COMPILER_MSVC) && defined(BASE_DLL) +#if !defined(COMPILER_MSVC) && defined(COMPONENT_BUILD) // Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated // in logging.cc. extern template std::string* MakeCheckOpString<int, int>( |