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

Side by Side Diff: test/library_dirs/subdir/test.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: only add .lib extension if it does not already exist Created 7 years, 2 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 unified diff | Download patch
« no previous file with comments | « pylib/gyp/msvs_emulation.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 Google Inc. All rights reserved. 1 # Copyright (c) 2013 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 # This creates a static library and puts it in a nonstandard location for 8 # This creates a static library and puts it in a nonstandard location for
9 # libraries-search-path-test. 9 # libraries-search-path-test.
10 'target_name': 'mylib', 10 'target_name': 'mylib',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 ], 44 ],
45 'sources': [ 45 'sources': [
46 'hello.cc', 46 'hello.cc',
47 ], 47 ],
48 # Note that without this, the mylib library would not be found and 48 # Note that without this, the mylib library would not be found and
49 # successfully linked. 49 # successfully linked.
50 'library_dirs': [ 50 'library_dirs': [
51 '<(abs_path_to_secret_library_location)', 51 '<(abs_path_to_secret_library_location)',
52 ], 52 ],
53 'link_settings': { 53 'link_settings': {
54 'conditions': [ 54 'libraries': [
55 ['OS=="linux"', { 55 '-lmylib',
scottmg 2013/09/26 20:20:48 since we're defacto supporting -lmylib.lib, please
56 'libraries': [ 56 ],
57 '-lmylib',
58 ],
59 }, { # else
60 'libraries': [
61 '<(STATIC_LIB_PREFIX)mylib<(STATIC_LIB_SUFFIX)',
62 ],
63 }],
64 ], # conditions
65 }, 57 },
66 }, 58 },
67 ], 59 ],
68 } 60 }
OLDNEW
« no previous file with comments | « pylib/gyp/msvs_emulation.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698