Skip to content

Commit

Permalink
[wx] Build fix, don't use the new FPD implementation yet, until we ca…
Browse files Browse the repository at this point in the history
…n merge ours with it.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@82018 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
kevino@webkit.org committed Mar 26, 2011
1 parent 609fc9e commit a378e45
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 0 deletions.
6 changes: 6 additions & 0 deletions 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.
Expand Down
6 changes: 6 additions & 0 deletions 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.
Expand Down
2 changes: 2 additions & 0 deletions Source/WebCore/platform/graphics/FontPlatformData.h
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions wscript
Expand Up @@ -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'
Expand Down

0 comments on commit a378e45

Please sign in to comment.