Title: [133678] trunk
- Revision
- 133678
- Author
- [email protected]
- Date
- 2012-11-06 15:25:20 -0800 (Tue, 06 Nov 2012)
Log Message
[EFL] Simplify the build system
https://bugs.webkit.org/show_bug.cgi?id=101392
Patch by Laszlo Gombos <[email protected]> on 2012-11-06
Reviewed by Kenneth Rohde Christiansen.
.:
Remove unused cmake variables. In addition there is no longer a need to define
WTF_USE_TEXTURE_MAPPER_GL in the build system as that is now handled in Platform.h
(see r133623).
* Source/cmake/OptionsEfl.cmake:
Source/WebKit:
Use WTF_USE_3D_GRAPHICS to guard the inclusion of surfaces and textmap
directories under WebCore/graphics to be consistent with
WebCore/PlatformEfl.cmake.
* PlatformEfl.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (133677 => 133678)
--- trunk/ChangeLog 2012-11-06 23:06:06 UTC (rev 133677)
+++ trunk/ChangeLog 2012-11-06 23:25:20 UTC (rev 133678)
@@ -1,3 +1,16 @@
+2012-11-06 Laszlo Gombos <[email protected]>
+
+ [EFL] Simplify the build system
+ https://bugs.webkit.org/show_bug.cgi?id=101392
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Remove unused cmake variables. In addition there is no longer a need to define
+ WTF_USE_TEXTURE_MAPPER_GL in the build system as that is now handled in Platform.h
+ (see r133623).
+
+ * Source/cmake/OptionsEfl.cmake:
+
2012-11-05 Simon Hausmann <[email protected]>
[Qt] Trivial unreviewed: Add missing module dependencies for builds in Qt CI system.
Modified: trunk/Source/WebKit/ChangeLog (133677 => 133678)
--- trunk/Source/WebKit/ChangeLog 2012-11-06 23:06:06 UTC (rev 133677)
+++ trunk/Source/WebKit/ChangeLog 2012-11-06 23:25:20 UTC (rev 133678)
@@ -1,3 +1,16 @@
+2012-11-06 Laszlo Gombos <[email protected]>
+
+ [EFL] Simplify the build system
+ https://bugs.webkit.org/show_bug.cgi?id=101392
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Use WTF_USE_3D_GRAPHICS to guard the inclusion of surfaces and textmap
+ directories under WebCore/graphics to be consistent with
+ WebCore/PlatformEfl.cmake.
+
+ * PlatformEfl.cmake:
+
2012-11-04 Halton Huo <[email protected]>
[EFL] Use _LIBRARIES instead of _LIBRARY
Modified: trunk/Source/WebKit/PlatformEfl.cmake (133677 => 133678)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-11-06 23:06:06 UTC (rev 133677)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-11-06 23:25:20 UTC (rev 133678)
@@ -79,7 +79,7 @@
)
ENDIF ()
-IF (WTF_USE_TEXTURE_MAPPER_GL)
+IF (WTF_USE_3D_GRAPHICS)
LIST(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/graphics/surfaces"
"${WEBCORE_DIR}/platform/graphics/texmap"
Modified: trunk/Source/cmake/OptionsEfl.cmake (133677 => 133678)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-11-06 23:06:06 UTC (rev 133677)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-11-06 23:25:20 UTC (rev 133678)
@@ -175,18 +175,13 @@
SET(CPACK_SOURCE_GENERATOR TBZ2)
IF (WTF_USE_TILED_BACKING_STORE)
- SET(WTF_USE_ACCELERATED_COMPOSITING 1)
ADD_DEFINITIONS(-DWTF_USE_ACCELERATED_COMPOSITING=1)
- SET(WTF_USE_COORDINATED_GRAPHICS 1)
ADD_DEFINITIONS(-DWTF_USE_COORDINATED_GRAPHICS=1)
SET(WTF_USE_TEXTURE_MAPPER 1)
ADD_DEFINITIONS(-DWTF_USE_TEXTURE_MAPPER=1)
- SET(WTF_USE_TEXTURE_MAPPER_GL 1)
- ADD_DEFINITIONS(-DWTF_USE_TEXTURE_MAPPER_GL=1)
-
SET(WTF_USE_3D_GRAPHICS 1)
ADD_DEFINITIONS(-DWTF_USE_3D_GRAPHICS=1)
@@ -194,7 +189,6 @@
ADD_DEFINITIONS(-DENABLE_3D_RENDERING=1)
SET (ENABLE_WEBGL 1)
- SET (WTF_USE_GRAPHICS_SURFACE 1)
ADD_DEFINITIONS(-DWTF_USE_GRAPHICS_SURFACE=1)
ADD_DEFINITIONS(-DHAVE_GLX)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
