[wx] Build fixes for recent changes.
[WebKit-https.git] / wscript
diff --git a/wscript b/wscript
index 0cb88505a204cc9b19520ec4b9d5d54446af09df..8942d1388ea59833e0be0bd9785ceb7c2896afce 100644 (file)
--- a/wscript
+++ b/wscript
@@ -259,6 +259,9 @@ def build(bld):
         excludes.append('HTMLEntityNames.cpp')
         excludes.append('tokenizer.cpp')
 
         excludes.append('HTMLEntityNames.cpp')
         excludes.append('tokenizer.cpp')
 
+        # Qt specific file in common sources
+        excludes.append('ContextShadow.cpp')
+
         # FIXME: these three require headers that I can't seem to find in trunk.
         # Investigate how to resolve these issues.
         excludes.append('JSAbstractView.cpp')
         # FIXME: these three require headers that I can't seem to find in trunk.
         # Investigate how to resolve these issues.
         excludes.append('JSAbstractView.cpp')
@@ -310,9 +313,18 @@ def build(bld):
             webcore.includes += ' WebKit/mac/WebCoreSupport WebCore/platform/mac'
             webcore.source += " WebKit/mac/WebCoreSupport/WebSystemInterface.mm"
             
             webcore.includes += ' WebKit/mac/WebCoreSupport WebCore/platform/mac'
             webcore.source += " WebKit/mac/WebCoreSupport/WebSystemInterface.mm"
             
+        if building_on_win32:
+            for wxlib in bld.env['LIB_WX']:
+                wxlibname = os.path.join(bld.env['LIBPATH_WX'][0], wxlib + '_vc.dll')
+                if os.path.exists(wxlibname):
+                    bld.install_files(obj.install_path, [wxlibname])
+        
+            for dep in windows_deps:
+                bld.install_files(obj.install_path, [os.path.join(msvclibs_dir, dep)])
+
     webcore.find_sources_in_dirs(full_dirs, excludes = excludes, exts=['.c', '.cpp'])
 
     bld.add_group()
     
     webcore.find_sources_in_dirs(full_dirs, excludes = excludes, exts=['.c', '.cpp'])
 
     bld.add_group()
     
-    if build_port == "wx":
+    if build_port == "wx":    
         bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python'])
         bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python'])