[wx] Build fix, don't use the new FPD implementation yet, until we can merge ours with it.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@82018 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 2d518cf..86d20e0 100644
--- 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 b43a35d..9b629f5 100644
--- 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 1fbb89a9..ea7c539 100644
--- 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 199ab1b..8f6c227 100644
--- a/wscript
+++ b/wscript
@@ -323,6 +323,9 @@
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'
