Title: [161094] trunk/Source/WebCore
- Revision
- 161094
- Author
- [email protected]
- Date
- 2013-12-26 15:01:22 -0800 (Thu, 26 Dec 2013)
Log Message
[Nix] Cleanup Source/WebCore/PlatformNix.cmake
https://bugs.webkit.org/show_bug.cgi?id=126226
Reviewed by Csaba Osztrogonác.
No new tests needed.
* PlatformNix.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161093 => 161094)
--- trunk/Source/WebCore/ChangeLog 2013-12-26 21:24:51 UTC (rev 161093)
+++ trunk/Source/WebCore/ChangeLog 2013-12-26 23:01:22 UTC (rev 161094)
@@ -1,3 +1,14 @@
+2013-12-26 Thiago de Barros Lacerda <[email protected]>
+
+ [Nix] Cleanup Source/WebCore/PlatformNix.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=126226
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests needed.
+
+ * PlatformNix.cmake:
+
2013-12-26 Joseph Pecoraro <[email protected]>
Unreviewed attempt at Windows build fix.
Modified: trunk/Source/WebCore/PlatformNix.cmake (161093 => 161094)
--- trunk/Source/WebCore/PlatformNix.cmake 2013-12-26 21:24:51 UTC (rev 161093)
+++ trunk/Source/WebCore/PlatformNix.cmake 2013-12-26 23:01:22 UTC (rev 161094)
@@ -1,16 +1,18 @@
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/nix"
- "${WEBCORE_DIR}/platform/cairo"
- "${WEBCORE_DIR}/platform/graphics/cairo"
- "${WEBCORE_DIR}/platform/graphics/freetype"
- "${WEBCORE_DIR}/platform/graphics/glx"
- "${WEBCORE_DIR}/platform/graphics/nix"
- "${WEBCORE_DIR}/platform/graphics/opengl"
- "${WEBCORE_DIR}/platform/graphics/opentype"
- "${WEBCORE_DIR}/platform/graphics/surfaces"
- "${WEBCORE_DIR}/platform/linux"
- "${WEBCORE_DIR}/platform/mediastream/gstreamer"
"${PLATFORM_DIR}/nix/"
+ platform/audio
+ platform/cairo
+ platform/graphics/cairo
+ platform/graphics/freetype
+ platform/graphics/glx
+ platform/graphics/nix
+ platform/graphics/opengl
+ platform/graphics/opentype
+ platform/graphics/surfaces
+ platform/linux
+ platform/mediastream
+ platform/mediastream/gstreamer
+ platform/nix
)
list(APPEND WebCore_SOURCES
@@ -83,6 +85,9 @@
platform/linux/GamepadDeviceLinux.cpp
+ platform/mediastream/nix/MediaStreamCenterNix.cpp
+ platform/mediastream/nix/UserMediaClientNix.cpp
+
platform/nix/CursorNix.cpp
platform/nix/DragDataNix.cpp
platform/nix/DragImageNix.cpp
@@ -109,7 +114,6 @@
platform/text/nix/TextBreakIteratorInternalICUNix.cpp
- plugins/PluginPackage.cpp
plugins/PluginPackageNone.cpp
plugins/PluginViewNone.cpp
)
@@ -181,8 +185,8 @@
endif ()
list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
- ${WEBCORE_DIR}/css/mediaControlsNix.css
- ${WEBCORE_DIR}/css/mediaControlsNixFullscreen.css
+ css/mediaControlsNix.css
+ css/mediaControlsNixFullscreen.css
)
list(APPEND WebCore_LIBRARIES
@@ -215,11 +219,9 @@
${ZLIB_INCLUDE_DIRS}
)
-add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")
-
if (ENABLE_WEB_AUDIO)
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/audio/nix"
+ platform/audio/nix
)
list(APPEND WebCore_SOURCES
platform/audio/nix/AudioBusNix.cpp
@@ -234,7 +236,7 @@
if (WTF_USE_CURL)
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/network/curl"
+ platform/network/curl
)
list(APPEND WebCore_SOURCES
@@ -270,6 +272,7 @@
loader/soup/SubresourceLoaderSoup.cpp
platform/network/soup/AuthenticationChallengeSoup.cpp
+ platform/network/soup/CertificateInfo.cpp
platform/network/soup/CookieJarSoup.cpp
platform/network/soup/CookieStorageSoup.cpp
platform/network/soup/CredentialStorageSoup.cpp
@@ -290,7 +293,7 @@
)
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/network/soup"
+ platform/network/soup
${LIBSOUP_INCLUDE_DIRS}
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
