[CMake] Use the correct list of files when compiling ANGLESupport on Windows
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Aug 2013 00:35:45 +0000 (00:35 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Aug 2013 00:35:45 +0000 (00:35 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog

index 50de478..3cd6c83 100644 (file)
@@ -2887,7 +2887,6 @@ if (WTF_USE_3D_GRAPHICS)
         ${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 @@ if (WTF_USE_3D_GRAPHICS)
         ${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
index dc5decb..85dfffd 100644 (file)
@@ -1,3 +1,12 @@
+2013-08-12  Patrick Gansterer  <paroga@webkit.org>
+
+        [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  <a.renevier@samsung.com>
 
         [cairo] memory corruption with putImageData and accelerated canvas.