summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-02 19:54:33 +0000
committerbungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-02 19:54:33 +0000
commitfba02466ad745b38ae6476fa6818bf64a8f20b54 (patch)
treedbfce978f0724db539bdac0bec58c30dd5fae0ee
parentb3b790236aff7ad17d0326b90cf6c1ca299c5bae (diff)
downloadgyp-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.gyp2
-rw-r--r--xps.gyp4
2 files changed, 3 insertions, 3 deletions
diff --git a/images.gyp b/images.gyp
index eed2dba..45f5de0 100644
--- a/images.gyp
+++ b/images.gyp
@@ -84,7 +84,7 @@
],
'link_settings': {
'libraries': [
- 'windowscodecs.lib',
+ '-lwindowscodecs.lib',
],
},
},{ #else if skia_os != win
diff --git a/xps.gyp b/xps.gyp
index 29d5e07..3258539 100644
--- a/xps.gyp
+++ b/xps.gyp
@@ -25,8 +25,8 @@
[ 'skia_os == "win"', {
'link_settings': {
'libraries': [
- 'T2Embed.lib',
- 'FontSub.lib',
+ '-lt2embed.lib',
+ '-lfontsub.lib',
],
},
},{ #else if 'skia_os != "win"'