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

Side by Side Diff: gyp/libjpeg.gyp

Issue 175383002: Fix warnings on Ubuntu13 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Respond to comments. Created 6 years, 10 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/libwebp.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. 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 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified 5 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified
6 # such that all source paths point into that directory. 6 # such that all source paths point into that directory.
7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp 7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp
8 # from Chrome's libjpeg port, rather than making our own copy') for a better 8 # from Chrome's libjpeg port, rather than making our own copy') for a better
9 # long-term solution. 9 # long-term solution.
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 '../third_party/externals/libjpeg/jquant1.c', 94 '../third_party/externals/libjpeg/jquant1.c',
95 '../third_party/externals/libjpeg/jquant2.c', 95 '../third_party/externals/libjpeg/jquant2.c',
96 '../third_party/externals/libjpeg/jutils.c', 96 '../third_party/externals/libjpeg/jutils.c',
97 '../third_party/externals/libjpeg/jversion.h', 97 '../third_party/externals/libjpeg/jversion.h',
98 ], 98 ],
99 'direct_dependent_settings': { 99 'direct_dependent_settings': {
100 'include_dirs': [ 100 'include_dirs': [
101 '../third_party/externals/libjpeg', 101 '../third_party/externals/libjpeg',
102 ], 102 ],
103 }, 103 },
104 'conditions': [ 104 'cflags': [
105 [ 'skia_os != "win"', { 105 '-w', # supresses warnings
106 'product_name': 'jpeg',
107 'cflags': [
108 '-Wno-main', # supresses warnings about naming things "main"
109 ],
110 }],
111 ], 106 ],
107
112 }, 108 },
113 ], 109 ],
114 }, { 110 }, {
115 'targets': [ 111 'targets': [
116 { 112 {
117 'target_name': 'libjpeg', 113 'target_name': 'libjpeg',
118 'type': 'none', 114 'type': 'none',
119 'direct_dependent_settings': { 115 'direct_dependent_settings': {
120 'defines': [ 116 'defines': [
121 'USE_SYSTEM_LIBJPEG', 117 'USE_SYSTEM_LIBJPEG',
122 ], 118 ],
123 }, 119 },
124 'link_settings': { 120 'link_settings': {
125 'libraries': [ 121 'libraries': [
126 '-ljpeg', 122 '-ljpeg',
127 ], 123 ],
128 }, 124 },
129 } 125 }
130 ], 126 ],
131 }], 127 }],
132 ], 128 ],
133 }], 129 }],
134 ], 130 ],
135 } 131 }
OLDNEW
« no previous file with comments | « no previous file | gyp/libwebp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698