| From 5f390ae5e8857ad8c4d0a8b00818eadd8d8f4daa Mon Sep 17 00:00:00 2001 |
| From: Alethea Rose <alethea@alethearose.com> |
| Date: Tue, 14 Feb 2017 23:11:03 -0500 |
| Subject: [PATCH 05/23] Remove .lib suffix on linked libraries |
| |
| --- |
| deps/v8/BUILD.gn | 8 ++++---- |
| deps/v8/gypfiles/v8.gyp | 8 ++++---- |
| node.gyp | 2 +- |
| 3 files changed, 9 insertions(+), 9 deletions(-) |
| |
| diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn |
| index 9d95036a..9a8c48db 100644 |
| --- a/deps/v8/BUILD.gn |
| +++ b/deps/v8/BUILD.gn |
| @@ -3127,10 +3127,10 @@ v8_component("v8_libbase") { |
| defines += [ "_CRT_RAND_S" ] # for rand_s() |
| |
| libs = [ |
| - "dbghelp.lib", |
| - "shlwapi.lib", |
| - "winmm.lib", |
| - "ws2_32.lib", |
| + "dbghelp", |
| + "shlwapi", |
| + "winmm", |
| + "ws2_32", |
| ] |
| |
| data_deps += [ "//build/win:runtime_libs" ] |
| diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp |
| index 05204ef2..1baa7ab3 100644 |
| --- a/deps/v8/gypfiles/v8.gyp |
| +++ b/deps/v8/gypfiles/v8.gyp |
| @@ -2152,10 +2152,10 @@ |
| 'msvs_disabled_warnings': [4351, 4355, 4800], |
| 'link_settings': { |
| 'libraries': [ |
| - '-ldbghelp.lib', |
| - '-lshlwapi.lib', |
| - '-lwinmm.lib', |
| - '-lws2_32.lib' |
| + '-ldbghelp', |
| + '-lshlwapi', |
| + '-lwinmm', |
| + '-lws2_32' |
| ], |
| }, |
| }], |
| diff --git a/node.gyp b/node.gyp |
| index 38dcdac0..dba17e28 100644 |
| --- a/node.gyp |
| +++ b/node.gyp |
| @@ -339,9 +339,9 @@ |
| 'conditions': [ |
| ['OS=="win"', { |
| 'libraries': [ |
| - 'dbghelp.lib', |
| - 'PsApi.lib', |
| - 'Ws2_32.lib', |
| + 'dbghelp', |
| + 'psapi', |
| + 'ws2_32', |
| ], |
| 'dll_files': [ |
| 'dbghelp.dll', |
| @@ -586,7 +586,7 @@ |
| ], |
| }], |
| ], |
| - 'libraries': [ '-lpsapi.lib' ] |
| + 'libraries': [ '-lpsapi' ] |
| }], |
| [ 'node_use_etw=="true"', { |
| 'defines': [ 'HAVE_ETW=1' ], |
| @@ -682,9 +682,9 @@ |
| 'conditions': [ |
| ['OS=="win"', { |
| 'libraries': [ |
| - 'dbghelp.lib', |
| - 'PsApi.lib', |
| - 'Ws2_32.lib', |
| + 'dbghelp', |
| + 'psapi', |
| + 'ws2_32', |
| ], |
| 'dll_files': [ |
| 'dbghelp.dll', |
| @@ -1047,9 +1047,9 @@ |
| 'conditions': [ |
| ['OS=="win"', { |
| 'libraries': [ |
| - 'dbghelp.lib', |
| - 'PsApi.lib', |
| - 'Ws2_32.lib', |
| + 'dbghelp', |
| + 'psapi', |
| + 'ws2_32', |
| ], |
| 'dll_files': [ |
| 'dbghelp.dll', |
| -- |
| 2.17.0.windows.1 |
