diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 11:02:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | e8b154fd68f9b33be40a3590e58347f353835f5c (patch) | |
| tree | 0733ce26384183245aaa5656af26c653636fe6c1 /JavaScriptCore/wscript | |
| parent | da56157816334089526a7a115a85fd85a6e9a1dc (diff) | |
| download | external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.zip external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.gz external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.bz2 | |
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Diffstat (limited to 'JavaScriptCore/wscript')
| -rw-r--r-- | JavaScriptCore/wscript | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/JavaScriptCore/wscript b/JavaScriptCore/wscript index e50b18d..d85364c 100644 --- a/JavaScriptCore/wscript +++ b/JavaScriptCore/wscript @@ -36,12 +36,13 @@ sources = [] jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp'])) -if building_on_win32: - jscore_excludes += ['MarkStackPosix.cpp', 'ThreadingPthreads.cpp'] - sources += ['runtime/MarkStackWin.cpp'] -else: - jscore_excludes.append('JSStringRefBSTR.cpp') - jscore_excludes.extend(get_excludes(jscore_dir, ['*Win.cpp'])) +if build_port == "wx": + if building_on_win32: + jscore_excludes += ['MarkStackPosix.cpp', 'ThreadingPthreads.cpp'] + sources += ['runtime/MarkStackWin.cpp'] + else: + jscore_excludes.append('JSStringRefBSTR.cpp') + jscore_excludes.extend(get_excludes(jscore_dir, ['*Win.cpp'])) def build(bld): import Options |