diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebKit/wx/wscript | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebKit/wx/wscript')
| -rw-r--r-- | WebKit/wx/wscript | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/WebKit/wx/wscript b/WebKit/wx/wscript index b5ba580..61fa903 100644 --- a/WebKit/wx/wscript +++ b/WebKit/wx/wscript @@ -81,6 +81,13 @@ def pre_build(bld): bld.env.CXXDEPS_WEBCORE = Utils.h_file(libwebcore) def build(bld): + + import TaskGen + + if sys.platform.startswith('darwin'): + TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cxx'] + TaskGen.task_gen.mappings['.m'] = TaskGen.task_gen.mappings['.cxx'] + bld.add_pre_fun(pre_build) bld.env.LIBDIR = output_dir @@ -95,6 +102,11 @@ def build(bld): uselib_local = '', install_path = output_dir) + exts = ['.c', '.cpp'] + if sys.platform.startswith('darwin'): + exts.append('.mm') + obj.includes += '../mac/WebCoreSupport ../../WebCore/platform/mac' + obj.source = "../mac/WebCoreSupport/WebSystemInterface.m" obj.find_sources_in_dirs(webkit_dirs) if building_on_win32: |