diff options
| -rw-r--r-- | base/base.gypi | 22 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 2 insertions, 24 deletions
diff --git a/base/base.gypi b/base/base.gypi index 58089e9..fa88b3e 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -423,7 +423,7 @@ 'targets': [ { 'target_name': 'base', - 'type': '<(component)', + 'type': '<(library)', 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165', 'variables': { 'base_target': 1, @@ -528,26 +528,6 @@ 'win_util.cc', ], },], - [ 'OS=="win" and component=="shared_library"', { - 'defines': [ - 'BASE_DLL', - 'BASE_IMPLEMENTATION=1', - ], - 'msvs_disabled_warnings': [ - 4251, - ], - 'sources!': [ - 'debug/debug_on_start_win.cc', - ], - 'direct_dependent_settings': { - 'defines': [ - 'BASE_DLL', - ], - 'msvs_disabled_warnings': [ - 4251, - ], - }, - }], ], 'sources': [ 'third_party/nspr/prcpucfg.h', diff --git a/build/common.gypi b/build/common.gypi index 5039f84..0a51eab 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2010 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -1554,8 +1554,6 @@ 'usp10.lib', 'psapi.lib', 'dbghelp.lib', - 'winmm.lib', - 'shlwapi.lib', ], 'conditions': [ ['msvs_express', { |