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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/SConscript ('k') | webkit/SConscript.port » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/SConscript
===================================================================
--- webkit/SConscript (revision 6978)
+++ webkit/SConscript (working copy)
@@ -44,17 +44,33 @@
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",
« 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