diff options
| -rw-r--r-- | webkit/SConscript | 4 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 10 | ||||
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 10 |
3 files changed, 18 insertions, 6 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index d3f3812..9ace6ab 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -50,7 +50,9 @@ elif env['PLATFORM'] == 'posix': 'BUILDING_GTK__', # In Platform.h, this doesn't get defined when BUILDING_GTK__ is # defined. - 'WTF_USE_ICU_UNICODE', + 'WTF_USE_ICU_UNICODE=1', + # We want webkit to use pthreads rather than gthread. + 'WTF_USE_PTHREADS=1', ], ) diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 47a8eee..0efe311 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -167,5 +167,15 @@ if env['PLATFORM'] == 'win32': '$WTF_DIR/win/MainThreadWin.cpp', '$WTF_DIR/ThreadingWin.cpp', ]) +elif env['PLATFORM'] == 'posix': + wtf_inputs.extend([ + '$WTF_DIR/gtk/MainThreadGtk.cpp', + '$WTF_DIR/ThreadingPthreads.cpp', + ]) + + # Re-add the include path for glib.h because it got lost when cloning the + # environment. + env.ParseConfig('pkg-config --cflags --libs glib-2.0') + env.ChromeStaticLibrary('WTF', wtf_inputs) diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 81ac682..1fd70e631 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -27,6 +27,8 @@ env.Append( ], LIBS = [ 'test_shell', + 'glue', + 'port', 'base', 'base_gfx', 'breakpad_handler', @@ -36,6 +38,9 @@ env.Append( 'skia', 'gtest', 'bzip2', + 'V8Bindings', + 'WebCore', + 'WTF', env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libjpeg', 'libpng', @@ -45,12 +50,7 @@ env.Append( 'zlib', 'v8', 'JavaScriptCore_pcre', - 'port', - 'WebCore', - 'WTF', - 'V8Bindings', 'default_plugin', - 'glue', ], ) |