Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1700)

Issue 4654080: combine target_defaults.gypi into common.gypi (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
13 years ago by epoger
Modified:
12 years, 12 months ago
Reviewers:
bungeman, Stephen White
CC:
skia-review_googlegroups.com
Base URL:
http://skia.googlecode.com/svn/trunk/
Visibility:
Public.

Description

platform-dependent settings were spread across these two files, and all our gyp targets were including both of these files anyway... so combined them.

Patch Set 1 #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+100 lines, -149 lines) Patch
M gyp/CocoaDebuggerApp.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/FileReaderApp.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/SampleApp.gyp View 2 chunks +2 lines, -4 lines 0 comments Download
M gyp/SimpleCocoaApp.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/animator.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/apptype_console.gypi View 1 chunk +0 lines, -5 lines 0 comments Download
M gyp/bench.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/common.gypi View 5 chunks +77 lines, -21 lines 1 comment Download
M gyp/core.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/effects.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/experimental.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/gm.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/gpu.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/images.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/libtess.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/opts.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/pdf.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/svg.gyp View 1 chunk +1 line, -1 line 0 comments Download
D gyp/target_defaults.gypi View 1 chunk +0 lines, -95 lines 0 comments Download
M gyp/tests.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/tools.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/utils.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/views.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/xml.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp/zlib.gyp View 1 chunk +1 line, -1 line 0 comments Download
M gyp_skia View 1 chunk +0 lines, -3 lines 0 comments Download

Messages

Total messages: 6
epoger
13 years ago (2011-07-01 16:20:41 UTC) #1
bungeman
On 2011/07/01 16:20:41, epoger wrote: LGTM
13 years ago (2011-07-01 17:08:16 UTC) #2
epoger
committed as r1780 Before committing, I patched this change into Linux, Mac, and Windows environments, ...
13 years ago (2011-07-01 17:17:26 UTC) #3
Stephen White
Thanks for cleaning this up. http://codereview.appspot.com/4654080/diff/1/gyp/common.gypi File gyp/common.gypi (right): http://codereview.appspot.com/4654080/diff/1/gyp/common.gypi#newcode70 gyp/common.gypi:70: 'OpenGL32.lib', Hmmm.. does this ...
12 years, 12 months ago (2011-07-04 20:55:05 UTC) #4
bungeman
On 2011/07/04 20:55:05, Stephen White wrote: > Thanks for cleaning this up. > > http://codereview.appspot.com/4654080/diff/1/gyp/common.gypi ...
12 years, 12 months ago (2011-07-06 12:30:55 UTC) #5
Stephen White
12 years, 12 months ago (2011-07-06 15:27:16 UTC) #6
On 2011/07/06 12:30:55, bungeman wrote:
> On 2011/07/04 20:55:05, Stephen White wrote:
> > Thanks for cleaning this up.
> > 
> > http://codereview.appspot.com/4654080/diff/1/gyp/common.gypi
> > File gyp/common.gypi (right):
> > 
> > http://codereview.appspot.com/4654080/diff/1/gyp/common.gypi#newcode70
> > gyp/common.gypi:70: 'OpenGL32.lib',
> > Hmmm.. does this mean that all binaries will link against OpenGL?  Is that
> > necessary?
> > 
> > Also, it looks like Mac and Linux specify this dependency in gpu.gyp.  We
> should
> > probably do it in the same file on all platforms.
> 
> Yes, it does mean they all link against OpenGL. This was true before as well,
> this change simply made it easier to see. This is something which needs to be
> cleaned up, so that each component which actually needs these libraries brings
> them in as they need them.

I think by doing this the way the Mac and Linux ports do it (by putting the
dependency in gpu.gyp and utils.gyp), this should Just Work:  anything that
links in libraries that make GL calls will link against OpenGL.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b