|
1935 | 1935 | ], |
1936 | 1936 | }], |
1937 | 1937 | ['OS=="win"', { |
1938 | | - 'variables': { |
1939 | | - 'gyp_generators': '<!(echo $GYP_GENERATORS)', |
1940 | | - }, |
1941 | 1938 | 'msvs_disabled_warnings': [4351, 4355, 4800], |
1942 | 1939 | 'conditions': [ |
1943 | | - ['node_use_pch!="true"', { |
| 1940 | + ['node_use_pch != "true"', { |
1944 | 1941 | # When building Official, the .lib is too large and exceeds the 2G |
1945 | 1942 | # limit. This breaks it into multiple pieces to avoid the limit. |
1946 | 1943 | # See http://crbug.com/485155. |
|
2248 | 2245 | 'defines': [ |
2249 | 2246 | '_CRT_RAND_S' # for rand_s() |
2250 | 2247 | ], |
2251 | | - 'variables': { |
2252 | | - 'gyp_generators': '<!(echo $GYP_GENERATORS)', |
2253 | | - }, |
2254 | | - 'conditions': [ |
2255 | | - ['gyp_generators=="make"', { |
2256 | | - 'variables': { |
2257 | | - 'build_env': '<!(uname -o)', |
2258 | | - }, |
2259 | | - 'conditions': [ |
2260 | | - ['build_env=="Cygwin"', { |
2261 | | - 'sources': [ |
2262 | | - '../src/base/debug/stack_trace_posix.cc', |
2263 | | - '../src/base/platform/platform-cygwin.cc', |
2264 | | - '../src/base/platform/platform-posix.cc', |
2265 | | - '../src/base/platform/platform-posix.h', |
2266 | | - ], |
2267 | | - }, { |
2268 | | - 'sources': [ |
2269 | | - '../src/base/debug/stack_trace_win.cc', |
2270 | | - '../src/base/platform/platform-win32.cc', |
2271 | | - '../src/base/win32-headers.h', |
2272 | | - ], |
2273 | | - }], |
2274 | | - ], |
2275 | | - 'link_settings': { |
2276 | | - 'libraries': [ '-lwinmm', '-lws2_32' ], |
2277 | | - }, |
2278 | | - }, { |
2279 | | - 'sources': [ |
2280 | | - '../src/base/debug/stack_trace_win.cc', |
2281 | | - '../src/base/platform/platform-win32.cc', |
2282 | | - '../src/base/win32-headers.h', |
2283 | | - ], |
2284 | | - 'msvs_disabled_warnings': [4351, 4355, 4800], |
2285 | | - 'link_settings': { |
2286 | | - 'libraries': [ |
2287 | | - '-ldbghelp.lib', |
2288 | | - '-lshlwapi.lib', |
2289 | | - '-lwinmm.lib', |
2290 | | - '-lws2_32.lib' |
2291 | | - ], |
2292 | | - }, |
2293 | | - }], |
| 2248 | + 'sources': [ |
| 2249 | + '../src/base/debug/stack_trace_win.cc', |
| 2250 | + '../src/base/platform/platform-win32.cc', |
| 2251 | + '../src/base/win32-headers.h', |
2294 | 2252 | ], |
| 2253 | + 'msvs_disabled_warnings': [4351, 4355, 4800], |
| 2254 | + 'link_settings': { |
| 2255 | + 'libraries': [ |
| 2256 | + '-ldbghelp.lib', |
| 2257 | + '-lshlwapi.lib', |
| 2258 | + '-lwinmm.lib', |
| 2259 | + '-lws2_32.lib' |
| 2260 | + ], |
| 2261 | + }, |
2295 | 2262 | }], |
2296 | 2263 | ['OS=="qnx"', { |
2297 | 2264 | 'link_settings': { |
|
0 commit comments