diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 23:20:38 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 23:20:38 +0000 |
| commit | 58cfa44c0acaa816621b49753aba8345ecb8c876 (patch) | |
| tree | 61c3791d72c6205106af176fddbc4d868f40ab0c /webkit/SConscript | |
| parent | 84658a60566f556b4053215439608e1dd07b96fb (diff) | |
| download | chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.zip chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.tar.gz chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.tar.bz2 | |
* Get linux building with the merge branch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 1f5d024..c071871 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -114,6 +114,15 @@ env.Append( DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"), SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"), + # This is a stop gap to get linux building in time for the webkit + # merge. The true fix is to move the above CPPPATH prepend under this + # Append block and remove all the old pending directories (and add the new + # upstream ones.) + CPPPATH = [ + '$WEBCORE_DIR/rendering', + '$WEBCORE_DIR/rendering/style', + ], + CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', '_SCL_SECURE_NO_DEPRECATE', @@ -129,12 +138,11 @@ env.Append( ['ANDROID_CANVAS_IMPL', '1'], ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'], 'USE_GOOGLE_URL_LIBRARY', - # TODO: Uncomment this when building the merged WebKit, - # so it uses the PLATFORM_SKIA definitions instead of - # the old cairo.h shim. - #'BUILDING_CHROMIUM__', + 'BUILDING_CHROMIUM__', 'CHROMIUM_BUILD', + 'WTF_USE_ICU_UNICODE', '_SECURE_ATL', + 'QNAME_DEFAULT_CONSTRUCTOR', 'LIBXSLT_STATIC', 'LIBXML_STATIC', @@ -143,7 +151,6 @@ env.Append( ['__PRETTY_FUNCTION__', '__FUNCTION__'], 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', - 'HAVE_CONFIG_H', '__STD_C', ], ) @@ -191,6 +198,7 @@ if env['PLATFORM'] == 'win32': ]) else: env.Prepend(CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8']) + env.SConscript(sconscript_dirs, exports=['env', 'env_res']) # Setup alias for all webkit related targets. @@ -203,7 +211,6 @@ env.SConscript(sconscript_dirs, exports=['env', 'env_res']) if env['PLATFORM'] == 'win32': env.Alias('webkit', ['../icudt38.dll']) - version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', ['$WEBCORE_DIR/Configurations/Version.xcconfig', '#/../webkit/build/webkit_version.py'], |