summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/base.gypi22
-rw-r--r--build/common.gypi2
2 files changed, 23 insertions, 1 deletions
diff --git a/base/base.gypi b/base/base.gypi
index fa88b3e..58089e9 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -423,7 +423,7 @@
'targets': [
{
'target_name': 'base',
- 'type': '<(library)',
+ 'type': '<(component)',
'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
'variables': {
'base_target': 1,
@@ -528,6 +528,26 @@
'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 03de1e2..38fc723 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1561,6 +1561,8 @@
'usp10.lib',
'psapi.lib',
'dbghelp.lib',
+ 'winmm.lib',
+ 'shlwapi.lib',
],
'conditions': [
['msvs_express', {