[wx] Unreviewed build fixes for recent changes in WebKit trunk and wxMSW.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 408e671..40ab94e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-29  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Fix library copying logic for wxMSW 2.9.x.
+
+        * wscript:
+
 2011-04-28  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c781d6f..c246903 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-29  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Fix wxMSW trunk builds by adding include.
+
+        * platform/graphics/wx/GraphicsContextWx.cpp:
+
 2011-04-29  Mike Reed  <reed@google.com>
 
         Reviewed by Ojan Vafai.

diff --git a/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp b/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
index 071df47..ed896a0 100644 (file)
--- a/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
+++ b/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
@@ -36,6 +36,11 @@
 #include <math.h>
 #include <stdio.h>
 
+// see http://trac.wxwidgets.org/ticket/11482
+#ifdef __WXMSW__
+#   include "wx/msw/winundef.h"
+#endif
+
 #include <wx/defs.h>
 #include <wx/window.h>
 #include <wx/dcclient.h>

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6b0c62a..e8546e8 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-29  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix, add new directory to the build.
+
+        * waf/build/settings.py:
+
 2011-04-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Reviewed by Martin Robinson.

diff --git a/Tools/waf/build/settings.py b/Tools/waf/build/settings.py
index bf84b76..f425879 100644 (file)
--- a/Tools/waf/build/settings.py
+++ b/Tools/waf/build/settings.py
@@ -129,6 +129,7 @@ webcore_dirs_common = [
     'Source/WebCore/platform/animation',
     'Source/WebCore/platform/graphics',
     'Source/WebCore/platform/graphics/filters',
+    'Source/WebCore/platform/graphics/filters/arm',
     'Source/WebCore/platform/graphics/transforms',
     'Source/WebCore/platform/image-decoders',
     'Source/WebCore/platform/image-decoders/bmp',

diff --git a/wscript b/wscript
index e508cbe..c6771f0 100644 (file)
--- a/wscript
+++ b/wscript
@@ -28,6 +28,7 @@
 import Options
 
 from settings import *
+import wxpresets
 
 import TaskGen
 from TaskGen import taskgen, feature, after
@@ -335,7 +336,11 @@ def build(bld):
             
         if building_on_win32:
             for wxlib in bld.env['LIB_WX']:
+                wx_version = wxpresets.get_wx_version(os.environ['WXWIN'])
+                if int(wx_version[1]) % 2 == 1:
+                    wxlib = wxlib.replace(''.join(wx_version[:2]), ''.join(wx_version))
                 wxlibname = os.path.join(bld.env['LIBPATH_WX'][0], wxlib + '_vc.dll')
+                print "Copying %s" % wxlibname
                 if os.path.exists(wxlibname):
                     bld.install_files(webcore.install_path, [wxlibname])