diff options
Diffstat (limited to 'WebKitTools/wx')
-rw-r--r-- | WebKitTools/wx/browser/wscript | 3 | ||||
-rw-r--r-- | WebKitTools/wx/build/settings.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/WebKitTools/wx/browser/wscript b/WebKitTools/wx/browser/wscript index a2a24e0..bd2640c 100644 --- a/WebKitTools/wx/browser/wscript +++ b/WebKitTools/wx/browser/wscript @@ -29,7 +29,8 @@ import sys from settings import * -include_paths = [os.path.join(wk_root, 'WebKit', 'wx')] +include_paths = [os.path.join(wk_root, 'WebCore', 'bindings', 'wx'), + os.path.join(wk_root, 'WebKit', 'wx')] def set_options(opt): common_set_options(opt) diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py index 122f93a..2d144f6 100644 --- a/WebKitTools/wx/build/settings.py +++ b/WebKitTools/wx/build/settings.py @@ -99,6 +99,7 @@ jscore_dirs = [ webcore_dirs = [ 'accessibility', 'bindings', + 'bindings/cpp', 'bindings/generic', 'bindings/js', 'bridge', @@ -168,7 +169,7 @@ def get_config(): waf_configname = waf_configname + ' CRT_MULTITHREADED_DLL' else: waf_configname = waf_configname + ' CRT_MULTITHREADED_DLL_DBG' - + return waf_configname create_hash_table = wk_root + "/JavaScriptCore/create_hash_table" @@ -176,7 +177,10 @@ if building_on_win32: create_hash_table = get_output('cygpath --unix "%s"' % create_hash_table) os.environ['CREATE_HASH_TABLE'] = create_hash_table -feature_defines = ['ENABLE_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER', 'ENABLE_SVG', 'ENABLE_SVG_USE', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS', 'ENABLE_SVG_ANIMATION', 'ENABLE_SVG_AS_IMAGE', 'ENABLE_SVG_FOREIGN_OBJECT'] +feature_defines = ['ENABLE_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER', + 'ENABLE_SVG', 'ENABLE_SVG_USE', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS', + 'ENABLE_SVG_ANIMATION', 'ENABLE_SVG_AS_IMAGE', 'ENABLE_SVG_FOREIGN_OBJECT', + 'ENABLE_JIT', 'ENABLE_EXECUTABLE_ALLOCATOR_DEMAND', 'BUILDING_%s' % build_port.upper()] msvc_version = 'msvc2008' |