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

Side by Side Diff: gyp/libjpeg.gyp

Issue 12480002: Fixing some warnings on Linux (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « gyp/jsoncpp.gyp ('k') | gyp/utils.gyp » ('j') | gyp/utils.gyp » ('J')
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 '-Wno-main', # supresses warnings about naming things "main" 86 '-Wno-main', # supresses warnings about naming things "main"
87 ], 87 ],
88 }], 88 }],
89 ['OS=="android"', { 89 ['OS=="android"', {
90 'cflags!': [ 90 'cflags!': [
91 '-fno-rtti', # supresses warnings about invalid option of non-C++ code 91 '-fno-rtti', # supresses warnings about invalid option of non-C++ code
92 '-Wall', 92 '-Wall',
93 '-Werror', 93 '-Werror',
94 ], 94 ],
95 }], 95 }],
96 ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
97 'cflags!': [
98 '-Werror',
99 ],
100 }],
96 ], 101 ],
97 }, 102 },
98 ], 103 ],
99 }, { 104 }, {
100 'targets': [ 105 'targets': [
101 { 106 {
102 'target_name': 'libjpeg', 107 'target_name': 'libjpeg',
103 'type': 'none', 108 'type': 'none',
104 'direct_dependent_settings': { 109 'direct_dependent_settings': {
105 'defines': [ 110 'defines': [
106 'USE_SYSTEM_LIBJPEG', 111 'USE_SYSTEM_LIBJPEG',
107 ], 112 ],
108 }, 113 },
109 'link_settings': { 114 'link_settings': {
110 'libraries': [ 115 'libraries': [
111 '-ljpeg', 116 '-ljpeg',
112 ], 117 ],
113 }, 118 },
114 } 119 }
115 ], 120 ],
116 }], 121 }],
117 ], 122 ],
118 } 123 }
119 124
120 # Local Variables: 125 # Local Variables:
121 # tab-width:2 126 # tab-width:2
122 # indent-tabs-mode:nil 127 # indent-tabs-mode:nil
123 # End: 128 # End:
124 # vim: set expandtab tabstop=2 shiftwidth=2: 129 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gyp/jsoncpp.gyp ('k') | gyp/utils.gyp » ('j') | gyp/utils.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698