Title: [184546] releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ANGLE
- Revision
- 184546
- Author
- [email protected]
- Date
- 2015-05-18 23:19:14 -0700 (Mon, 18 May 2015)
Log Message
[ANGLE][W32] Buildsystem is hardcoded for UNIX
https://bugs.webkit.org/show_bug.cgi?id=143762
Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Carlos Garcia Campos.
Don't hardcode ossource_posix.cpp in the makefile
Compile ossource_posix.cpp or ossource_win.cpp depending on the target.
Otherwise you get an error:
../webkitgtk-2.4.8/Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp:13:2: error: #error Trying to build a posix specific file in a non-posix build.
* GNUmakefile.am:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ANGLE/ChangeLog (184545 => 184546)
--- releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ANGLE/ChangeLog 2015-05-19 06:15:12 UTC (rev 184545)
+++ releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ANGLE/ChangeLog 2015-05-19 06:19:14 UTC (rev 184546)
@@ -1,3 +1,19 @@
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
+ [ANGLE][W32] Buildsystem is hardcoded for UNIX
+ https://bugs.webkit.org/show_bug.cgi?id=143762
+
+ Reviewed by Carlos Garcia Campos.
+
+ Don't hardcode ossource_posix.cpp in the makefile
+
+ Compile ossource_posix.cpp or ossource_win.cpp depending on the target.
+
+ Otherwise you get an error:
+ ../webkitgtk-2.4.8/Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp:13:2: error: #error Trying to build a posix specific file in a non-posix build.
+
+ * GNUmakefile.am:
+
2014-07-04 Carlos Garcia Campos <[email protected]>
[GTK] [Stable] Crash in TSymbolTableLevel::~TSymbolTableLevel with GCC 4.9
Modified: releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ANGLE/GNUmakefile.am (184545 => 184546)
--- releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ANGLE/GNUmakefile.am 2015-05-19 06:15:12 UTC (rev 184545)
+++ releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ANGLE/GNUmakefile.am 2015-05-19 06:19:14 UTC (rev 184546)
@@ -80,7 +80,6 @@
Source/ThirdParty/ANGLE/src/compiler/MMap.h \
Source/ThirdParty/ANGLE/src/compiler/NodeSearch.h \
Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
- Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
@@ -161,3 +160,9 @@
Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
+
+if TARGET_WIN32
+libANGLE_la_SOURCES += Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp
+else
+libANGLE_la_SOURCES += Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp
+endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
