Title: [194424] trunk/Source/WebCore
- Revision
- 194424
- Author
- [email protected]
- Date
- 2015-12-26 22:34:59 -0800 (Sat, 26 Dec 2015)
Log Message
[CMake] Rearrange new gamepad files with deprecated files
https://bugs.webkit.org/show_bug.cgi?id=152564
Reviewed by Alex Christensen.
New gamepad files have been commented out in CMakeLists.txt so far. This patch
rearrange the files with deprecated files using ENABLE_GAMEPAD.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (194423 => 194424)
--- trunk/Source/WebCore/CMakeLists.txt 2015-12-27 06:27:03 UTC (rev 194423)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-12-27 06:34:59 UTC (rev 194424)
@@ -6,8 +6,6 @@
"${WEBCORE_DIR}/Modules/airplay"
"${WEBCORE_DIR}/Modules/battery"
"${WEBCORE_DIR}/Modules/encryptedmedia"
- "${WEBCORE_DIR}/Modules/gamepad"
- "${WEBCORE_DIR}/Modules/gamepad/deprecated"
"${WEBCORE_DIR}/Modules/geolocation"
"${WEBCORE_DIR}/Modules/indexeddb"
"${WEBCORE_DIR}/Modules/indexeddb/client"
@@ -139,7 +137,6 @@
Modules/airplay
Modules/battery
Modules/encryptedmedia
- Modules/gamepad
Modules/geolocation
Modules/indexeddb
Modules/indieui
@@ -155,8 +152,6 @@
Modules/webdatabase
Modules/websockets
- Modules/gamepad/deprecated
-
bindings/generic
bindings/js
@@ -173,17 +168,6 @@
Modules/battery/BatteryManager.idl
Modules/battery/NavigatorBattery.idl
-# FIXME: These were causing name conflicts on Mac, and the Gamepad API is not finished yet.
-# https://bugs.webkit.org/show_bug.cgi?id=135858
-# Modules/gamepad/Gamepad.idl
-# Modules/gamepad/GamepadButton.idl
-# Modules/gamepad/GamepadEvent.idl
-# Modules/gamepad/NavigatorGamepad.idl
-
- Modules/gamepad/deprecated/Gamepad.idl
- Modules/gamepad/deprecated/GamepadList.idl
- Modules/gamepad/deprecated/NavigatorGamepad.idl
-
Modules/geolocation/Coordinates.idl
Modules/geolocation/Geolocation.idl
Modules/geolocation/Geoposition.idl
@@ -829,10 +813,6 @@
Modules/battery/BatteryStatus.cpp
Modules/battery/NavigatorBattery.cpp
- Modules/gamepad/deprecated/Gamepad.cpp
- Modules/gamepad/deprecated/GamepadList.cpp
- Modules/gamepad/deprecated/NavigatorGamepad.cpp
-
Modules/geolocation/Coordinates.cpp
Modules/geolocation/GeoNotifier.cpp
Modules/geolocation/Geolocation.cpp
@@ -3252,6 +3232,43 @@
)
endif ()
+if (ENABLE_GAMEPAD)
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/Modules/gamepad"
+ )
+
+ list(APPEND WebCore_IDL_INCLUDES
+ Modules/gamepad
+ )
+
+ list(APPEND WebCore_NON_SVG_IDL_FILES
+ Modules/gamepad/Gamepad.idl
+ Modules/gamepad/GamepadButton.idl
+ Modules/gamepad/GamepadEvent.idl
+ Modules/gamepad/NavigatorGamepad.idl
+ )
+elseif (ENABLE_GAMEPAD_DEPRECATED)
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/Modules/gamepad/deprecated"
+ )
+
+ list(APPEND WebCore_IDL_INCLUDES
+ Modules/gamepad/deprecated
+ )
+
+ list(APPEND WebCore_NON_SVG_IDL_FILES
+ Modules/gamepad/deprecated/Gamepad.idl
+ Modules/gamepad/deprecated/GamepadList.idl
+ Modules/gamepad/deprecated/NavigatorGamepad.idl
+ )
+
+ list(APPEND WebCore_SOURCES
+ Modules/gamepad/deprecated/Gamepad.cpp
+ Modules/gamepad/deprecated/GamepadList.cpp
+ Modules/gamepad/deprecated/NavigatorGamepad.cpp
+ )
+endif ()
+
if (ENABLE_WEB_REPLAY)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${_javascript_CORE_DIR}/inspector"
Modified: trunk/Source/WebCore/ChangeLog (194423 => 194424)
--- trunk/Source/WebCore/ChangeLog 2015-12-27 06:27:03 UTC (rev 194423)
+++ trunk/Source/WebCore/ChangeLog 2015-12-27 06:34:59 UTC (rev 194424)
@@ -1,3 +1,15 @@
+2015-12-26 Gyuyoung Kim <[email protected]>
+
+ [CMake] Rearrange new gamepad files with deprecated files
+ https://bugs.webkit.org/show_bug.cgi?id=152564
+
+ Reviewed by Alex Christensen.
+
+ New gamepad files have been commented out in CMakeLists.txt so far. This patch
+ rearrange the files with deprecated files using ENABLE_GAMEPAD.
+
+ * CMakeLists.txt:
+
2015-12-26 Per Arne Vollan <[email protected]>
[Curl] Compile errors.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
