diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/CMakeListsEfl.txt | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/CMakeListsEfl.txt')
| -rw-r--r-- | Source/WebCore/CMakeListsEfl.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Source/WebCore/CMakeListsEfl.txt b/Source/WebCore/CMakeListsEfl.txt index d9b387e..ba7b554 100644 --- a/Source/WebCore/CMakeListsEfl.txt +++ b/Source/WebCore/CMakeListsEfl.txt @@ -54,11 +54,21 @@ LIST(APPEND WebCore_SOURCES platform/efl/SystemTimeEfl.cpp platform/efl/TemporaryLinkStubs.cpp platform/efl/WidgetEfl.cpp + platform/graphics/ImageSource.cpp platform/graphics/efl/FontEfl.cpp platform/graphics/efl/IconEfl.cpp platform/graphics/efl/ImageEfl.cpp platform/graphics/efl/IntPointEfl.cpp platform/graphics/efl/IntRectEfl.cpp + platform/image-decoders/ImageDecoder.cpp + platform/image-decoders/bmp/BMPImageDecoder.cpp + platform/image-decoders/bmp/BMPImageReader.cpp + platform/image-decoders/gif/GIFImageDecoder.cpp + platform/image-decoders/gif/GIFImageReader.cpp + platform/image-decoders/ico/ICOImageDecoder.cpp + platform/image-decoders/jpeg/JPEGImageDecoder.cpp + platform/image-decoders/png/PNGImageDecoder.cpp + platform/image-decoders/webp/WEBPImageDecoder.cpp platform/posix/FileSystemPOSIX.cpp platform/text/efl/TextBreakIteratorInternalICUEfl.cpp plugins/PluginDataNone.cpp @@ -163,6 +173,7 @@ IF (ENABLE_VIDEO) ) LIST(APPEND WebCore_SOURCES platform/graphics/gstreamer/GOwnPtrGStreamer.cpp + platform/graphics/gstreamer/GRefPtrGStreamer.cpp platform/graphics/gstreamer/GStreamerGWorld.cpp platform/graphics/gstreamer/ImageGStreamerCairo.cpp platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp @@ -229,11 +240,9 @@ ENDIF () IF (ENABLE_GLIB_SUPPORT) LIST(APPEND WebCore_LIBRARIES - ${GDK_LIBRARIES} ${Glib_LIBRARIES} ) LIST(APPEND WebCore_INCLUDE_DIRECTORIES - ${GDK_INCLUDE_DIRS} ${Glib_INCLUDE_DIRS} ) ENDIF () |