Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: test/library_dirs/subdir/test-win.gyp

Issue 24792003: homogenize msvs and ninja library_dir and libraries settings for Windows (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: add -lmylib.lib test case for win32/cygwin Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
},
},
« test/library_dirs/gyptest-library-dirs.py ('K') | « test/library_dirs/subdir/test.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698