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

Side by Side Diff: gyp/core.gyp

Issue 1417753003: Revert of SkTime::GetNSecs() (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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 | « no previous file | gyp/tools.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # Core Skia library code. 5 # Core Skia library code.
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'core', 9 'target_name': 'core',
10 'product_name': 'skia_core', 10 'product_name': 'skia_core',
(...skipping 22 matching lines...) Expand all
33 '../src/utils', 33 '../src/utils',
34 ], 34 ],
35 'sources': [ 35 'sources': [
36 'core.gypi', # Makes the gypi appear in IDEs (but does not modify the bu ild). 36 'core.gypi', # Makes the gypi appear in IDEs (but does not modify the bu ild).
37 ], 37 ],
38 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], 38 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
39 'conditions': [ 39 'conditions': [
40 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 40 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
41 'link_settings': { 41 'link_settings': {
42 'libraries': [ 42 'libraries': [
43 '-lrt',
44 '-lpthread', 43 '-lpthread',
45 ], 44 ],
46 }, 45 },
47 }], 46 }],
48 [ 'skia_os == "mac"', { 47 [ 'skia_os == "mac"', {
49 'include_dirs': [ 48 'include_dirs': [
50 '../include/utils/mac', 49 '../include/utils/mac',
51 ], 50 ],
52 'sources': [ 51 'sources': [
53 '../include/utils/mac/SkCGUtils.h', 52 '../include/utils/mac/SkCGUtils.h',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 [ 'skia_os == "win"', { 124 [ 'skia_os == "win"', {
126 'include_dirs': [ 125 'include_dirs': [
127 'config/win', 126 'config/win',
128 ], 127 ],
129 }], 128 }],
130 ], 129 ],
131 }, 130 },
132 }, 131 },
133 ], 132 ],
134 } 133 }
OLDNEW
« no previous file with comments | « no previous file | gyp/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698