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

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

Issue 16507: One more step towards working Mac SCons build.... (Closed) Base URL: http://src.chromium.org/svn/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
« no previous file with comments | « no previous file | webkit/build/port/SConscript » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 'contrib/minizip/unzip.c', 56 'contrib/minizip/unzip.c',
57 'contrib/minizip/unzip.h' 57 'contrib/minizip/unzip.h'
58 ]) 58 ])
59 59
60 if env.Bit('windows'): 60 if env.Bit('windows'):
61 input_files.extend([ 61 input_files.extend([
62 'contrib/minizip/iowin32.c', 62 'contrib/minizip/iowin32.c',
63 'contrib/minizip/iowin32.h', 63 'contrib/minizip/iowin32.h',
64 ]) 64 ])
65 65
66 if env.Bit('posix'):
67 env.Append(
68 CCFLAGS = [
69 '-Wno-parentheses',
70 '-Wno-unused-variable',
71 ],
72 )
73
66 env.ChromeLibrary('zlib', input_files) 74 env.ChromeLibrary('zlib', input_files)
67 75
68 p = env.ChromeMSVSProject('zlib.vcproj', 76 p = env.ChromeMSVSProject('zlib.vcproj',
69 guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}', 77 guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}',
70 files=input_files, 78 files=input_files,
71 relative_path_prefix=r'./', 79 relative_path_prefix=r'./',
72 tools = [ 80 tools = [
73 'VCLibrarianTool', 81 'VCLibrarianTool',
74 'VCCLCompilerTool', 82 'VCCLCompilerTool',
75 ]) 83 ])
(...skipping 14 matching lines...) Expand all
90 '$(SolutionDir)../build/release.vsprops', 98 '$(SolutionDir)../build/release.vsprops',
91 '$(SolutionDir)../build/external_code.vsprops', 99 '$(SolutionDir)../build/external_code.vsprops',
92 './zlib.vsprops' 100 './zlib.vsprops'
93 ]) 101 ])
94 102
95 env.AlwaysBuild(p) 103 env.AlwaysBuild(p)
96 104
97 i = env.Command('$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', p, 105 i = env.Command('$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', p,
98 Copy('$TARGET', '$SOURCE')) 106 Copy('$TARGET', '$SOURCE'))
99 Alias('msvs', i) 107 Alias('msvs', i)
OLDNEW
« no previous file with comments | « no previous file | webkit/build/port/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698