third_party/zlib/zlib.scons - Issue 17008: Fix zlib bustage with hammer build.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: third_party/zlib/zlib.scons

Issue 17008: Fix zlib bustage with hammer build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 11 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

OLD	NEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2006-2008 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 __doc__ = """	5 __doc__ = """

6 Configuration for building zlib.lib / libzlib.a.	6 Configuration for building zlib.lib / libzlib.a.

7 """	7 """

8	8

9 Import('env')	9 Import('env')

10	10

11 if env.WantSystemLib('zlib'):	11 if env.WantSystemLib('zlib'):

12 env.Append(ZLIB_LIB = ['z'])	12 env.Append(ZLIB_LIB = ['z'])

13 Return()	13 Return()

14	14

15 env = env.Clone()	15 env = env.Clone()

16	16

17 env.Append(	17 env.Append(

	18 CPPPATH = ['$ZLIB_DIR'],

18 ZLIB_LIB = ['zlib'],	19 ZLIB_LIB = ['zlib'],

19 )	20 )

20	21

21 if env.Bit('windows'):	22 if env.Bit('windows'):

22 env.Append(	23 env.Append(

23 CCFLAGS = [	24 CCFLAGS = [

24 '/TC',	25 '/TC',

25 '/wd4800',	26 '/wd4800',

26 ],	27 ],

27 )	28 )

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 '$(SolutionDir)../build/release.vsprops',	90 '$(SolutionDir)../build/release.vsprops',

90 '$(SolutionDir)../build/external_code.vsprops',	91 '$(SolutionDir)../build/external_code.vsprops',

91 './zlib.vsprops'	92 './zlib.vsprops'

92 ])	93 ])

93	94

94 env.AlwaysBuild(p)	95 env.AlwaysBuild(p)

95	96

96 i = env.Command('$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', p,	97 i = env.Command('$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', p,

97 Copy('$TARGET', '$SOURCE'))	98 Copy('$TARGET', '$SOURCE'))

98 Alias('msvs', i)	99 Alias('msvs', i)

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »