[wx] Build fixes for wxMSW.

[WebKit.git] / wscript

diff --git a/wscript b/wscript
index 94ac739b5fb57f47568db83acb711a777e296d37..100f68f49493fb406ed0030c595bf30547297cbc 100644 (file)
--- a/wscript
+++ b/wscript
@@ -48,6 +48,7 @@ if build_port == "wx":
 
 if sys.platform.startswith("win"):
     wk_includes.append(os.path.join(wk_root, 'WebCore','platform','win'))
 
 if sys.platform.startswith("win"):
     wk_includes.append(os.path.join(wk_root, 'WebCore','platform','win'))

+    wk_includes.append(os.path.join(wk_root, 'WebCore','platform','graphics','win'))

 
 windows_deps = [
                 'lib/pthreadVC2.dll',
 
 windows_deps = [
                 'lib/pthreadVC2.dll',


@@ -68,6 +69,7 @@ if build_port == "wx":
         webcore_sources['wx-win'] = [
                'WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp',
                'WebCore/platform/graphics/win/TransformationMatrixWin.cpp',
         webcore_sources['wx-win'] = [
                'WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp',
                'WebCore/platform/graphics/win/TransformationMatrixWin.cpp',

+               'WebCore/platform/ScrollAnimatorWin.cpp',

                # wxTimer on Windows has a bug that causes it to eat crashes in callbacks
                # so we need to use the Win port's implementation until the wx bug fix is
                # widely available (it was fixed in 2.8.10).
                # wxTimer on Windows has a bug that causes it to eat crashes in callbacks
                # so we need to use the Win port's implementation until the wx bug fix is
                # widely available (it was fixed in 2.8.10).


@@ -181,7 +183,7 @@ def configure(conf):
     for api_file in glob.glob(os.path.join(jscore_dir, 'API/*.h')):
         shutil.copy(api_file, os.path.join(jscore_out_dir, os.path.basename(api_file)))
 
     for api_file in glob.glob(os.path.join(jscore_dir, 'API/*.h')):
         shutil.copy(api_file, os.path.join(jscore_out_dir, os.path.basename(api_file)))
 

-    if Options.options.wxpython:
+    if build_port == "wx" and Options.options.wxpython:

         common_configure(conf)
         conf.check_tool('swig', tooldir='WebKit/wx/bindings/python')
         conf.check_swig_version('1.3.29')
         common_configure(conf)
         conf.check_tool('swig', tooldir='WebKit/wx/bindings/python')
         conf.check_swig_version('1.3.29')