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

Side by Side Diff: webkit/SConscript

Issue 14113: Remove few more errors in mac scons build. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years 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 | « skia/SConscript ('k') | webkit/SConscript.port » ('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 import os 5 import os
6 6
7 Import(['env']) 7 Import(['env'])
8 8
9 env = env.Clone() 9 env = env.Clone()
10 env_res = env.Clone() 10 env_res = env.Clone()
(...skipping 26 matching lines...) Expand all
37 # deeper magic, and maybe a SCons modification.) 37 # deeper magic, and maybe a SCons modification.)
38 38
39 port_dir = env.Dir('$WEBKIT_DIR/port') 39 port_dir = env.Dir('$WEBKIT_DIR/port')
40 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port')) 40 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port'))
41 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore')) 41 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore'))
42 42
43 if env['PLATFORM'] == 'win32': 43 if env['PLATFORM'] == 'win32':
44 env['WEBKIT_PLATFORM_SUBDIR'] = 'win' 44 env['WEBKIT_PLATFORM_SUBDIR'] = 'win'
45 elif env['PLATFORM'] == 'darwin': 45 elif env['PLATFORM'] == 'darwin':
46 env['WEBKIT_PLATFORM_SUBDIR'] = 'mac' 46 env['WEBKIT_PLATFORM_SUBDIR'] = 'mac'
47 env.Append(
48 CCFLAGS = [
49 '-Wno-reorder',
50 '-Wno-unused',
51 ],
52 )
53 env.Prepend(
54 CPPPATH = [env.subst(x) for x in [
55 '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/cg',
56 '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/archive/cf',
57 ]]
58 )
47 elif env['PLATFORM'] == 'posix': 59 elif env['PLATFORM'] == 'posix':
48 env.Append( 60 env.Append(
49 CCFLAGS = [
50 '-Wno-parentheses',
51 ],
52 CPPDEFINES = [ 61 CPPDEFINES = [
53 # We want webkit to use pthreads rather than gthread. 62 # We want webkit to use pthreads rather than gthread.
54 'WTF_USE_PTHREADS=1', 63 'WTF_USE_PTHREADS=1',
55 ], 64 ],
56 ) 65 )
57 66
67 if env['PLATFORM'] in ('darwin', 'posix'):
68 env.Append(
69 CCFLAGS = [
70 '-Wno-parentheses',
71 ],
72 )
73
58 env.Append( 74 env.Append(
59 WEBCORE_DIR = '$THIRD_PARTY_WEBKIT_DIR/WebCore', 75 WEBCORE_DIR = '$THIRD_PARTY_WEBKIT_DIR/WebCore',
60 PENDING_DIR = "$WEBKIT_DIR/pending", 76 PENDING_DIR = "$WEBKIT_DIR/pending",
61 PORT_DIR = "$WEBKIT_DIR/port", 77 PORT_DIR = "$WEBKIT_DIR/port",
62 78
63 JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore", 79 JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore",
64 WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf", 80 WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf",
65 KJS_DIR = "$JAVASCRIPTCORE_DIR/kjs", 81 KJS_DIR = "$JAVASCRIPTCORE_DIR/kjs",
66 PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre", 82 PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre",
67 83
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 # add their own individual targets to the 'webkit' Alias. 273 # add their own individual targets to the 'webkit' Alias.
258 #env.Alias('webkit', ['.', '$DESTINATION_ROOT/icudt38.dll']) 274 #env.Alias('webkit', ['.', '$DESTINATION_ROOT/icudt38.dll'])
259 if env['PLATFORM'] == 'win32': 275 if env['PLATFORM'] == 'win32':
260 env.Alias('webkit', ['$DESTINATION_ROOT/icudt38.dll']) 276 env.Alias('webkit', ['$DESTINATION_ROOT/icudt38.dll'])
261 277
262 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', 278 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
263 ['$WEBCORE_DIR/Configurations/Version.xcconfig', 279 ['$WEBCORE_DIR/Configurations/Version.xcconfig',
264 '$CHROME_SRC_DIR/webkit/build/webkit_version.py'], 280 '$CHROME_SRC_DIR/webkit/build/webkit_version.py'],
265 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") 281 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
266 env.AlwaysBuild(version) 282 env.AlwaysBuild(version)
OLDNEW
« no previous file with comments | « skia/SConscript ('k') | webkit/SConscript.port » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698