summaryrefslogtreecommitdiffstats
path: root/Tools/wx
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/wx')
-rw-r--r--Tools/wx/browser/wscript2
-rw-r--r--Tools/wx/build/build_utils.py2
-rw-r--r--Tools/wx/build/settings.py3
3 files changed, 3 insertions, 4 deletions
diff --git a/Tools/wx/browser/wscript b/Tools/wx/browser/wscript
index 4fb00b4..7c5aeee 100644
--- a/Tools/wx/browser/wscript
+++ b/Tools/wx/browser/wscript
@@ -30,7 +30,7 @@ import sys
from settings import *
include_paths = [os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'),
- os.path.join(wk_root, 'WebKit', 'wx')]
+ os.path.join(wk_root, 'Source', 'WebKit', 'wx')]
def set_options(opt):
common_set_options(opt)
diff --git a/Tools/wx/build/build_utils.py b/Tools/wx/build/build_utils.py
index bf440a6..569703d 100644
--- a/Tools/wx/build/build_utils.py
+++ b/Tools/wx/build/build_utils.py
@@ -120,7 +120,7 @@ def update_wx_deps(conf, wk_root, msvc_version='msvc2008'):
sys.exit(1)
# since this module is still experimental
- wxpy_dir = os.path.join(wk_root, 'WebKit', 'wx', 'bindings', 'python')
+ wxpy_dir = os.path.join(wk_root, 'Source', 'WebKit', 'wx', 'bindings', 'python')
swig_module = download_if_newer('http://wxwebkit.wxcommunity.com/downloads/deps/swig.py.txt', wxpy_dir)
if swig_module:
shutil.copy(os.path.join(wxpy_dir, 'swig.py.txt'), os.path.join(wxpy_dir, 'swig.py'))
diff --git a/Tools/wx/build/settings.py b/Tools/wx/build/settings.py
index 64c2693..2b757c4 100644
--- a/Tools/wx/build/settings.py
+++ b/Tools/wx/build/settings.py
@@ -86,7 +86,6 @@ jscore_dirs = [
'interpreter',
'jit',
'parser',
- 'pcre',
'profiler',
'runtime',
'wtf',
@@ -102,7 +101,6 @@ webcore_dirs = [
'Source/WebCore/bindings/cpp',
'Source/WebCore/bindings/generic',
'Source/WebCore/bindings/js',
- 'Source/WebCore/bindings/js/specialization',
'Source/WebCore/bridge',
'Source/WebCore/bridge/c',
'Source/WebCore/bridge/jsc',
@@ -116,6 +114,7 @@ webcore_dirs = [
'Source/WebCore/html',
'Source/WebCore/html/canvas',
'Source/WebCore/html/parser',
+ 'Source/WebCore/html/shadow',
'Source/WebCore/inspector',
'Source/WebCore/loader',
'Source/WebCore/loader/appcache',