Index: net/net.gyp |
=================================================================== |
--- net/net.gyp (revision 90986) |
+++ net/net.gyp (working copy) |
@@ -9,7 +9,6 @@ |
'targets': [ |
{ |
'target_name': 'net', |
- 'type': 'static_library', |
'dependencies': [ |
'../base/base.gyp:base', |
'../base/base.gyp:base_i18n', |
@@ -788,6 +787,7 @@ |
}, |
], |
[ 'OS == "win"', { |
+ 'type': '<(component)', |
'sources!': [ |
'http/http_auth_handler_ntlm_portable.cc', |
'socket/tcp_client_socket_libevent.cc', |
@@ -803,8 +803,8 @@ |
'third_party/nss/ssl.gyp:ssl', |
'tld_cleanup', |
], |
- }, |
- { # else: OS != "win" |
+ }, { # else: OS != "win" |
+ 'type': 'static_library', |
'sources!': [ |
'base/winsock_init.cc', |
'base/winsock_init.h', |
@@ -815,6 +815,23 @@ |
], |
}, |
], |
+ [ 'OS == "win" and component == "shared_library"', { |
+ 'defines': [ |
+ 'NET_DLL', |
+ 'NET_IMPLEMENTATION', |
+ ], |
+ 'msvs_disabled_warnings': [ |
+ 4251, |
wtc
2011/06/29 23:15:50
Would be nice to add a comment to note what this w
rvargas (doing something else)
2011/06/30 00:22:13
Done.
|
+ ], |
+ 'direct_dependent_settings': { |
+ 'defines': [ |
+ 'NET_DLL', |
+ ], |
+ 'msvs_disabled_warnings': [ |
+ 4251, |
+ ], |
+ }, |
+ }], |
[ 'OS == "mac"', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nspr', |