gyp/codec.gyp - Issue 1032253003: Enable both static and dynamically linked libpng

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: gyp/codec.gyp

diff --git a/gyp/codec.gyp b/gyp/codec.gyp

index ee8eaad003ec14360c4db9135f3dc73681f32672..f21280088bd417690fe1716931cb5a06a9c2c740 100644

--- a/gyp/codec.gyp

+++ b/gyp/codec.gyp

@@ -17,7 +17,7 @@

'standalone_static_library': 1,

'dependencies': [

'core.gyp:*',

- 'libpng.gyp:libpng',

+ '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.

'cflags':[

# FIXME: This gets around a longjmp warning. See

« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('j') | third_party/libpng/pnglibconf.h » ('J')