diff options
| -rw-r--r-- | base/base.gyp | 4 | ||||
| -rw-r--r-- | base/base.gypi | 25 | ||||
| -rw-r--r-- | base/base_switches.h | 24 |
3 files changed, 27 insertions, 26 deletions
diff --git a/base/base.gyp b/base/base.gyp index 629e23f..8c3dfce 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -62,6 +62,8 @@ 'target_name': 'base_static', 'type': 'static_library', 'sources': [ + 'base_switches.cc', + 'base_switches.h', 'win/pe_image.cc', 'win/pe_image.h', ], @@ -75,6 +77,8 @@ 'target_name': 'base_static_win64', 'type': 'static_library', 'sources': [ + 'base_switches.cc', + 'base_switches.h', 'win/pe_image.cc', 'win/pe_image.h', ], diff --git a/base/base.gypi b/base/base.gypi index 36e609e..49e931a 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -34,8 +34,6 @@ 'base_paths_linux.cc', 'base_paths_win.cc', 'base_paths_win.h', - 'base_switches.cc', - 'base_switches.h', 'basictypes.h', 'bind.h', 'bind_helpers.h', @@ -436,9 +434,13 @@ 'base_target': 1, }, 'dependencies': [ + 'base_static', '../third_party/modp_b64/modp_b64.gyp:modp_b64', 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', ], + 'export_dependent_settings': [ + 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + ], # TODO(gregoryd): direct_dependent_settings should be shared with the # 64-bit target, but it doesn't work due to a bug in gyp 'direct_dependent_settings': { @@ -518,21 +520,18 @@ ], }, }], - [ 'OS == "win"', { - 'dependencies': ['base_static'], - }, - { # else OS != WIN - 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], - 'sources!': [ - 'third_party/purify/pure_api.c', - 'event_recorder.cc', - 'resource_util.cc', - ], + [ 'OS != "win"', { + 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], + 'sources!': [ + 'third_party/purify/pure_api.c', + 'event_recorder.cc', + 'resource_util.cc', + ], },], [ 'component=="shared_library"', { 'defines': [ 'BASE_DLL', - 'BASE_IMPLEMENTATION', + 'BASE_IMPLEMENTATION=1', ], 'conditions': [ ['OS=="win"', { diff --git a/base/base_switches.h b/base/base_switches.h index 3c70117..c261b4a 100644 --- a/base/base_switches.h +++ b/base/base_switches.h @@ -8,21 +8,19 @@ #define BASE_BASE_SWITCHES_H_ #pragma once -#include "base/base_api.h" - namespace switches { -BASE_API extern const char kDebugOnStart[]; -BASE_API extern const char kDisableBreakpad[]; -BASE_API extern const char kEnableDCHECK[]; -BASE_API extern const char kFullMemoryCrashReport[]; -BASE_API extern const char kLocalePak[]; -BASE_API extern const char kNoErrorDialogs[]; -BASE_API extern const char kNoMessageBox[]; -BASE_API extern const char kTestChildProcess[]; -BASE_API extern const char kV[]; -BASE_API extern const char kVModule[]; -BASE_API extern const char kWaitForDebugger[]; +extern const char kDebugOnStart[]; +extern const char kDisableBreakpad[]; +extern const char kEnableDCHECK[]; +extern const char kFullMemoryCrashReport[]; +extern const char kLocalePak[]; +extern const char kNoErrorDialogs[]; +extern const char kNoMessageBox[]; +extern const char kTestChildProcess[]; +extern const char kV[]; +extern const char kVModule[]; +extern const char kWaitForDebugger[]; } // namespace switches |