From 3f96abd259a9b719df4122ced56cd276501417ee Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Mon, 15 Dec 2008 16:06:35 +0000 Subject: Remove few more errors in mac scons build. BUG=5525 Review URL: http://codereview.chromium.org/14113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6981 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/SConscript | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'webkit/SConscript') diff --git a/webkit/SConscript b/webkit/SConscript index e748b1a..5867657 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -44,17 +44,33 @@ if env['PLATFORM'] == 'win32': env['WEBKIT_PLATFORM_SUBDIR'] = 'win' elif env['PLATFORM'] == 'darwin': env['WEBKIT_PLATFORM_SUBDIR'] = 'mac' -elif env['PLATFORM'] == 'posix': env.Append( CCFLAGS = [ - '-Wno-parentheses', + '-Wno-reorder', + '-Wno-unused', ], + ) + env.Prepend( + CPPPATH = [env.subst(x) for x in [ + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/cg', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/archive/cf', + ]] + ) +elif env['PLATFORM'] == 'posix': + env.Append( CPPDEFINES = [ # We want webkit to use pthreads rather than gthread. 'WTF_USE_PTHREADS=1', ], ) +if env['PLATFORM'] in ('darwin', 'posix'): + env.Append( + CCFLAGS = [ + '-Wno-parentheses', + ], + ) + env.Append( WEBCORE_DIR = '$THIRD_PARTY_WEBKIT_DIR/WebCore', PENDING_DIR = "$WEBKIT_DIR/pending", -- cgit v1.1