[wx] Build fix, don't use the new FPD implementation yet, until we can merge ours...

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

diff --git a/ChangeLog b/ChangeLog
index 2d518cf1b26ec78c36d60df0b482c0fff1c6d10a..86d20e0b19f33d9becd58e082a2847ce877a89e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-25  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Build fix, don't use the new FPD implementation yet, until we can merge ours with it.
+
+        * wscript:
+
 2011-03-23  George Guo  <George.Guo@nokia.com>
 
         Reviewed by Darin Adler.

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b43a35d1a1903abc8b67a6f4b8df1b980329f762..9b629f514d14e6df10e1e322c91717364eb2f8d3 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-25  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Build fix, don't use the new FPD implementation yet, until we can merge ours with it.
+
+        * platform/graphics/FontPlatformData.h:
+
 2011-03-25  Jer Noble  <jer.noble@apple.com>
 
         Reviewed by Eric Carlson.

diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h
index 1fbb89a987ecf7e2578712ca86fc99b177ec96ac..ea7c539f156c25a64e354bdedfec3c35bc6612d2 100644 (file)
--- a/Source/WebCore/platform/graphics/FontPlatformData.h
+++ b/Source/WebCore/platform/graphics/FontPlatformData.h
@@ -27,6 +27,8 @@
 #include "chromium/FontPlatformData.h"
 #elif PLATFORM(QT)
 #include "qt/FontPlatformData.h"
+#elif PLATFORM(WX)
+#include "wx/FontPlatformData.h"
 #elif PLATFORM(GTK) && USE(FREETYPE)
 #include "freetype/FontPlatformData.h"
 #elif PLATFORM(GTK) && USE(PANGO)

diff --git a/wscript b/wscript
index 199ab1b00cd8058b122e2482f1d3517884864854..8f6c22755e7e8dc911eccd3b59f76243f496318e 100644 (file)
--- a/wscript
+++ b/wscript
@@ -323,6 +323,9 @@ def build(bld):
         excludes.append('LoaderRunLoopCF.cpp')
         excludes.append('ResourceErrorCF.cpp')
         
+        # once we move over to the new FPD implementation, remove this.
+        excludes.append('FontPlatformData.cpp')
+        
         if sys.platform.startswith('darwin'):
             webcore.includes += ' Source/WebKit/mac/WebCoreSupport WebCore/platform/mac'
             webcore.source += ' Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm'