OLD | NEW |
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 |
11 { | 11 { |
12 'variables': { | 12 'variables': { |
13 'use_system_libjpeg%': 0, | 13 'use_system_libjpeg%': 0, |
| 14 'skia_warnings_as_errors': 0, |
14 }, | 15 }, |
15 'conditions': [ | 16 'conditions': [ |
16 ['skia_os == "android"', { | 17 ['skia_os == "android"', { |
17 'targets': [ | 18 'targets': [ |
18 { | 19 { |
19 'target_name': 'libjpeg', | 20 'target_name': 'libjpeg', |
20 'type': 'none', | 21 'type': 'none', |
21 'dependencies': [ | 22 'dependencies': [ |
22 'android_deps.gyp:jpeg', | 23 'android_deps.gyp:jpeg', |
23 ], | 24 ], |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 '../third_party/externals/libjpeg/jquant2.c', | 89 '../third_party/externals/libjpeg/jquant2.c', |
89 '../third_party/externals/libjpeg/jutils.c', | 90 '../third_party/externals/libjpeg/jutils.c', |
90 '../third_party/externals/libjpeg/jversion.h', | 91 '../third_party/externals/libjpeg/jversion.h', |
91 ], | 92 ], |
92 'direct_dependent_settings': { | 93 'direct_dependent_settings': { |
93 'include_dirs': [ | 94 'include_dirs': [ |
94 '../third_party/externals/libjpeg', | 95 '../third_party/externals/libjpeg', |
95 ], | 96 ], |
96 }, | 97 }, |
97 'conditions': [ | 98 'conditions': [ |
98 ['OS!="win"', { | 99 [ 'skia_os != "win"', { |
99 'product_name': 'jpeg', | 100 'product_name': 'jpeg', |
100 'cflags': [ | 101 'cflags': [ |
101 '-Wno-main', # supresses warnings about naming things "main" | 102 '-Wno-main', # supresses warnings about naming things "main" |
102 ], | 103 ], |
103 }], | 104 }], |
104 ['OS=="android"', { | |
105 'cflags!': [ | |
106 '-fno-rtti', # supresses warnings about invalid option of non
-C++ code | |
107 '-Wall', | |
108 '-Werror', | |
109 ], | |
110 }], | |
111 ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { | |
112 'cflags!': [ | |
113 '-Werror', | |
114 ], | |
115 }], | |
116 ], | 105 ], |
117 }, | 106 }, |
118 ], | 107 ], |
119 }, { | 108 }, { |
120 'targets': [ | 109 'targets': [ |
121 { | 110 { |
122 'target_name': 'libjpeg', | 111 'target_name': 'libjpeg', |
123 'type': 'none', | 112 'type': 'none', |
124 'direct_dependent_settings': { | 113 'direct_dependent_settings': { |
125 'defines': [ | 114 'defines': [ |
(...skipping 11 matching lines...) Expand all Loading... |
137 ], | 126 ], |
138 }], | 127 }], |
139 ], | 128 ], |
140 } | 129 } |
141 | 130 |
142 # Local Variables: | 131 # Local Variables: |
143 # tab-width:2 | 132 # tab-width:2 |
144 # indent-tabs-mode:nil | 133 # indent-tabs-mode:nil |
145 # End: | 134 # End: |
146 # vim: set expandtab tabstop=2 shiftwidth=2: | 135 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |