⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 194429 in webkit


Ignore:
Timestamp:
Dec 28, 2015, 9:21:15 AM (11 years ago)
Author:
Gyuyoung Kim
Message:

[CMake][EFL] Fix build breaks when enabling GAMEPAD
​https://bugs.webkit.org/show_bug.cgi?id=152573

Reviewed by Alex Christensen.

When enabling GAMEPAD feature on EFL and GTK, there are build breaks.
Fixed all.

  • CMakeLists.txt:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r194424 r194429  
    793793    svg/SVGZoomAndPan.idl
    794794    svg/SVGZoomEvent.idl
    795 )
    796 
    797 set(WebCore_IDL_FILES
    798     ${WebCore_NON_SVG_IDL_FILES}
    799     ${WebCore_SVG_IDL_FILES}
    800795)
    801796
    … …  
    28282823)
    28292824
     2825if (ENABLE_GAMEPAD)
     2826    list(APPEND WebCore_INCLUDE_DIRECTORIES
     2827        "${WEBCORE_DIR}/Modules/gamepad"
     2828    )
     2829
     2830    list(APPEND WebCore_IDL_INCLUDES
     2831        Modules/gamepad
     2832    )
     2833
     2834    list(APPEND WebCore_NON_SVG_IDL_FILES
     2835        Modules/gamepad/Gamepad.idl
     2836        Modules/gamepad/GamepadButton.idl
     2837        Modules/gamepad/GamepadEvent.idl
     2838        Modules/gamepad/NavigatorGamepad.idl
     2839    )
     2840
     2841    list(APPEND WebCore_SOURCES
     2842        Modules/gamepad/Gamepad.cpp
     2843        Modules/gamepad/GamepadButton.cpp
     2844        Modules/gamepad/GamepadEvent.cpp
     2845        Modules/gamepad/GamepadManager.cpp
     2846        Modules/gamepad/NavigatorGamepad.cpp
     2847
     2848        platform/GamepadProvider.cpp
     2849    )
     2850elseif (ENABLE_GAMEPAD_DEPRECATED)
     2851    list(APPEND WebCore_INCLUDE_DIRECTORIES
     2852        "${WEBCORE_DIR}/Modules/gamepad/deprecated"
     2853    )
     2854
     2855    list(APPEND WebCore_IDL_INCLUDES
     2856        Modules/gamepad/deprecated
     2857    )
     2858
     2859    list(APPEND WebCore_NON_SVG_IDL_FILES
     2860        Modules/gamepad/deprecated/Gamepad.idl
     2861        Modules/gamepad/deprecated/GamepadList.idl
     2862        Modules/gamepad/deprecated/NavigatorGamepad.idl
     2863    )
     2864
     2865    list(APPEND WebCore_SOURCES
     2866        Modules/gamepad/deprecated/Gamepad.cpp
     2867        Modules/gamepad/deprecated/GamepadList.cpp
     2868        Modules/gamepad/deprecated/NavigatorGamepad.cpp
     2869    )
     2870endif ()
     2871
     2872set(WebCore_IDL_FILES
     2873    ${WebCore_NON_SVG_IDL_FILES}
     2874    ${WebCore_SVG_IDL_FILES}
     2875)
     2876
    28302877if (ENABLE_ALLINONE_BUILD)
    28312878    message(STATUS "All-in-One build is enabled.")
    … …  
    32333280endif ()
    32343281
    3235 if (ENABLE_GAMEPAD)
    3236     list(APPEND WebCore_INCLUDE_DIRECTORIES
    3237         "${WEBCORE_DIR}/Modules/gamepad"
    3238     )
    3239 
    3240     list(APPEND WebCore_IDL_INCLUDES
    3241         Modules/gamepad
    3242     )
    3243 
    3244     list(APPEND WebCore_NON_SVG_IDL_FILES
    3245         Modules/gamepad/Gamepad.idl
    3246         Modules/gamepad/GamepadButton.idl
    3247         Modules/gamepad/GamepadEvent.idl
    3248         Modules/gamepad/NavigatorGamepad.idl
    3249     )
    3250 elseif (ENABLE_GAMEPAD_DEPRECATED)
    3251     list(APPEND WebCore_INCLUDE_DIRECTORIES
    3252         "${WEBCORE_DIR}/Modules/gamepad/deprecated"
    3253     )
    3254 
    3255     list(APPEND WebCore_IDL_INCLUDES
    3256         Modules/gamepad/deprecated
    3257     )
    3258 
    3259     list(APPEND WebCore_NON_SVG_IDL_FILES
    3260         Modules/gamepad/deprecated/Gamepad.idl
    3261         Modules/gamepad/deprecated/GamepadList.idl
    3262         Modules/gamepad/deprecated/NavigatorGamepad.idl
    3263     )
    3264 
    3265     list(APPEND WebCore_SOURCES
    3266         Modules/gamepad/deprecated/Gamepad.cpp
    3267         Modules/gamepad/deprecated/GamepadList.cpp
    3268         Modules/gamepad/deprecated/NavigatorGamepad.cpp
    3269     )
    3270 endif ()
    3271 
    32723282if (ENABLE_WEB_REPLAY)
    32733283    list(APPEND WebCore_INCLUDE_DIRECTORIES

  • trunk/Source/WebCore/ChangeLog

    r194428 r194429  
     12015-12-28  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
     2
     3        [CMake][EFL] Fix build breaks when enabling GAMEPAD
     4        https://bugs.webkit.org/show_bug.cgi?id=152573
     5
     6        Reviewed by Alex Christensen.
     7
     8        When enabling GAMEPAD feature on EFL and GTK, there are build breaks.
     9        Fixed all.
     10
     11        * CMakeLists.txt:
     12
    1132015-12-25  Andy Estes  <aestes@apple.com>
    214
Note: See TracChangeset for help on using the changeset viewer.