diff options
author | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-02 19:54:33 +0000 |
---|---|---|
committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-02 19:54:33 +0000 |
commit | fba02466ad745b38ae6476fa6818bf64a8f20b54 (patch) | |
tree | dbfce978f0724db539bdac0bec58c30dd5fae0ee | |
parent | b3b790236aff7ad17d0326b90cf6c1ca299c5bae (diff) | |
download | gyp-fba02466ad745b38ae6476fa6818bf64a8f20b54.tar.gz |
Libraries without '-l' treated as relative paths.
The following have the same effect on Windows:
'msvs_settings': { 'VCLinkerTool': { 'AdditionalDependencies': [ 'windowscodecs.lib', ],},},
'link_settings': {'libraries': ['-lwindowscodecs.lib',],},
But this one is different:
'link_settings': {'libraries': ['windowscodecs.lib',],},
since this last one will attempt to find the library at
third_party\skia\gyp\windowscodecs.lib
or a place like this, instead of looking in the library paths.
This also fixes capitalization of the affected libraries.
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/99463002
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12434 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | images.gyp | 2 | ||||
-rw-r--r-- | xps.gyp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -84,7 +84,7 @@ ], 'link_settings': { 'libraries': [ - 'windowscodecs.lib', + '-lwindowscodecs.lib', ], }, },{ #else if skia_os != win @@ -25,8 +25,8 @@ [ 'skia_os == "win"', { 'link_settings': { 'libraries': [ - 'T2Embed.lib', - 'FontSub.lib', + '-lt2embed.lib', + '-lfontsub.lib', ], }, },{ #else if 'skia_os != "win"' |