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

Side by Side Diff: gyp/codec.gyp

Issue 1032253003: Enable both static and dynamically linked libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('j') | third_party/libpng/pnglibconf.h » ('J')
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 # Copyright 2015 Google Inc. 5 # Copyright 2015 Google Inc.
6 # 6 #
7 # Use of this source code is governed by a BSD-style license that can be 7 # Use of this source code is governed by a BSD-style license that can be
8 # found in the LICENSE file. 8 # found in the LICENSE file.
9 9
10 # GYP file for codec project. 10 # GYP file for codec project.
11 { 11 {
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'codec', 14 'target_name': 'codec',
15 'product_name': 'skia_codec', 15 'product_name': 'skia_codec',
16 'type': 'static_library', 16 'type': 'static_library',
17 'standalone_static_library': 1, 17 'standalone_static_library': 1,
18 'dependencies': [ 18 'dependencies': [
19 'core.gyp:*', 19 'core.gyp:*',
20 'libpng.gyp:libpng', 20 'libpng.gyp:libpng_static',
djsollen 2015/03/26 16:39:12 need to make this conditional so that the framewor
scroggo 2015/03/26 17:19:02 I'm not sure what you mean by this comment. Is thi
djsollen 2015/04/01 15:12:43 This is addressed in my next patch.
21 ], 21 ],
22 'cflags':[ 22 'cflags':[
23 # FIXME: This gets around a longjmp warning. See 23 # FIXME: This gets around a longjmp warning. See
24 # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu- GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio 24 # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu- GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
25 '-Wno-clobbered', 25 '-Wno-clobbered',
26 ], 26 ],
27 'include_dirs': [ 27 'include_dirs': [
28 '../include/codec', 28 '../include/codec',
29 '../src/codec', 29 '../src/codec',
30 '../src/core', 30 '../src/core',
31 ], 31 ],
32 'sources': [ 32 'sources': [
33 '../src/codec/SkCodec.cpp', 33 '../src/codec/SkCodec.cpp',
34 '../src/codec/SkCodec_libbmp.cpp', 34 '../src/codec/SkCodec_libbmp.cpp',
35 '../src/codec/SkCodec_libico.cpp', 35 '../src/codec/SkCodec_libico.cpp',
36 '../src/codec/SkCodec_libpng.cpp', 36 '../src/codec/SkCodec_libpng.cpp',
37 '../src/codec/SkMaskSwizzler.cpp', 37 '../src/codec/SkMaskSwizzler.cpp',
38 '../src/codec/SkMasks.cpp', 38 '../src/codec/SkMasks.cpp',
39 '../src/codec/SkSwizzler.cpp', 39 '../src/codec/SkSwizzler.cpp',
40 ], 40 ],
41 'direct_dependent_settings': { 41 'direct_dependent_settings': {
42 'include_dirs': [ 42 'include_dirs': [
43 '../include/codec', 43 '../include/codec',
44 ], 44 ],
45 }, 45 },
46 }, 46 },
47 ], 47 ],
48 } 48 }
OLDNEW
« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('j') | third_party/libpng/pnglibconf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698