Changeset 241876 in webkit


Ignore:
Timestamp:
Feb 21, 2019 1:06:37 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake][Win] Fix !USE(CF) build of WebCore
https://bugs.webkit.org/show_bug.cgi?id=194879

Reviewed by Konstantin Tokarev.

  • PlatformAppleWin.cmake:
  • PlatformWin.cmake:
  • PlatformWinCairo.cmake:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r241869 r241876  
     12019-02-21  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Fix !USE(CF) build of WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=194879
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * PlatformAppleWin.cmake:
     9        * PlatformWin.cmake:
     10        * PlatformWinCairo.cmake:
     11
    1122019-02-21  Zalan Bujtas  <zalan@apple.com>
    213
  • trunk/Source/WebCore/PlatformAppleWin.cmake

    r239724 r241876  
    6666    platform/network/cf/SocketStreamHandleImplCFNet.cpp
    6767    platform/network/cf/SynchronousLoaderClientCFNet.cpp
     68
     69    platform/text/LocaleNone.cpp
    6870)
    6971
  • trunk/Source/WebCore/PlatformWin.cmake

    r240437 r241876  
    2323    accessibility/win/AccessibilityObjectWrapperWin.cpp
    2424
    25     editing/SmartReplaceCF.cpp
    2625    editing/win/EditorWin.cpp
    2726
     
    7473    platform/network/win/DownloadBundleWin.cpp
    7574    platform/network/win/NetworkStateNotifierWin.cpp
    76 
    77     platform/text/LocaleNone.cpp
    7875
    7976    platform/win/BString.cpp
     
    245242
    246243    list(APPEND WebCore_SOURCES
     244        editing/SmartReplaceCF.cpp
     245
    247246        loader/archive/cf/LegacyWebArchive.cpp
    248247
     
    264263
    265264        platform/cf/win
     265    )
     266
     267    list(APPEND WebCore_LIBRARIES ${COREFOUNDATION_LIBRARY})
     268    list(APPEND WebCoreTestSupport_LIBRARIES ${COREFOUNDATION_LIBRARY})
     269else ()
     270    list(APPEND WebCore_SOURCES
     271        platform/generic/KeyedDecoderGeneric.cpp
     272        platform/generic/KeyedEncoderGeneric.cpp
     273
     274        platform/text/Hyphenation.cpp
     275    )
     276
     277    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
     278        platform/generic
    266279    )
    267280endif ()
  • trunk/Source/WebCore/PlatformWinCairo.cmake

    r237181 r241876  
    3737
    3838list(APPEND WebCore_LIBRARIES
    39     ${CURL_LIBRARY}
    4039    ${DirectX_LIBRARIES}
    41     CFLite
    4240    comctl32
    4341    crypt32
     
    5351list(APPEND WebCoreTestSupport_LIBRARIES
    5452    ${CAIRO_LIBRARIES}
    55     CFLite
    5653    shlwapi
    5754)
Note: See TracChangeset for help on using the changeset viewer.