Commit 955585fd authored by kevino@webkit.org's avatar kevino@webkit.org

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


git-svn-id: svn://svn.chromium.org/blink/trunk@82018 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 1fba262f
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.
......
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.
......@@ -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)
......
......@@ -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'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment