Chromium Code Reviews| Index: test/library_dirs/subdir/test-win.gyp |
| diff --git a/test/library_dirs/subdir/test.gyp b/test/library_dirs/subdir/test-win.gyp |
| similarity index 93% |
| copy from test/library_dirs/subdir/test.gyp |
| copy to test/library_dirs/subdir/test-win.gyp |
| index f83d7f2bf1f8ff1bf3a51455f5528b8fe0475422..b8bf7e3ad1036b67b98bafc85916c5d9ca2acdba 100644 |
| --- a/test/library_dirs/subdir/test.gyp |
| +++ b/test/library_dirs/subdir/test-win.gyp |
| @@ -22,7 +22,7 @@ |
| ], |
| }, |
| { |
| - 'target_name': 'libraries-search-path-test', |
| + 'target_name': 'libraries-search-path-test-lib-suffix', |
| 'type': 'executable', |
| 'dependencies': [ |
| # It is important to NOT list the mylib as a dependency here, because |
| @@ -52,15 +52,15 @@ |
| ], |
| 'link_settings': { |
| 'conditions': [ |
| - ['OS=="linux"', { |
| + ['OS=="win"', { |
| 'libraries': [ |
| - '-lmylib', |
| + '-lmylib.lib', |
| ], |
| }, { # else |
| 'libraries': [ |
|
scottmg
2013/09/27 20:38:47
delete this branch condition?
ericvw
2013/09/27 21:48:02
I did this originally in the event it did get run
|
| - '<(STATIC_LIB_PREFIX)mylib<(STATIC_LIB_SUFFIX)', |
| + '-lmylib', |
| ], |
| - }], |
| + }] |
| ], # conditions |
| }, |
| }, |