Title: [153968] trunk/Source/WebCore
Revision
153968
Author
[email protected]
Date
2013-08-12 17:35:45 -0700 (Mon, 12 Aug 2013)

Log Message

[CMake] Use the correct list of files when compiling ANGLESupport on Windows
https://bugs.webkit.org/show_bug.cgi?id=119439

Reviewed by Gyuyoung Kim.

* CMakeLists.txt: Use ossource_win.cpp instead of ossource_posix.cpp on Windows platforms.

Modified Paths

Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (153967 => 153968)


--- trunk/Source/WebCore/CMakeLists.txt	2013-08-13 00:28:16 UTC (rev 153967)
+++ trunk/Source/WebCore/CMakeLists.txt	2013-08-13 00:35:45 UTC (rev 153968)
@@ -2887,7 +2887,6 @@
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/intermOut.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/IntermTraverse.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/MapLongVariableNames.cpp
-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_posix.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputESSL.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputGLSL.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputGLSLBase.cpp
@@ -2926,6 +2925,16 @@
         ${THIRDPARTY_DIR}/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
     )
 
+    if (WIN32)
+        list(APPEND ANGLESupport_SOURCES
+            ${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_win.cpp
+        )
+    else ()
+        list(APPEND ANGLESupport_SOURCES
+            ${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_posix.cpp
+        )
+    endif ()
+
     list(APPEND WebCore_SOURCES
         platform/graphics/ANGLEWebKitBridge.cpp
         platform/graphics/GraphicsContext3D.cpp

Modified: trunk/Source/WebCore/ChangeLog (153967 => 153968)


--- trunk/Source/WebCore/ChangeLog	2013-08-13 00:28:16 UTC (rev 153967)
+++ trunk/Source/WebCore/ChangeLog	2013-08-13 00:35:45 UTC (rev 153968)
@@ -1,3 +1,12 @@
+2013-08-12  Patrick Gansterer  <[email protected]>
+
+        [CMake] Use the correct list of files when compiling ANGLESupport on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=119439
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt: Use ossource_win.cpp instead of ossource_posix.cpp on Windows platforms.
+
 2013-08-12  Arnaud Renevier  <[email protected]>
 
         [cairo] memory corruption with putImageData and accelerated canvas.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to