Title: [154176] trunk/Source
- Revision
- 154176
- Author
- [email protected]
- Date
- 2013-08-16 05:10:14 -0700 (Fri, 16 Aug 2013)
Log Message
Unreviewed, rolling out r153749.
http://trac.webkit.org/changeset/153749
https://bugs.webkit.org/show_bug.cgi?id=119892
The bison generation of the glslang* files has now been fixed. (Requested by zdobersek on #webkit).
Patch by Commit Queue <[email protected]> on 2013-08-16
Source/ThirdParty/ANGLE:
* GNUmakefile.am: Preserve the libANGLE.la dependency on the ANGLE's GNUmakefile.am.
Source/WebCore:
* GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (154175 => 154176)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-16 11:50:50 UTC (rev 154175)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-16 12:10:14 UTC (rev 154176)
@@ -1,3 +1,13 @@
+2013-08-16 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r153749.
+ http://trac.webkit.org/changeset/153749
+ https://bugs.webkit.org/show_bug.cgi?id=119892
+
+ The bison generation of the glslang* files has now been fixed. (Requested by zdobersek on #webkit).
+
+ * GNUmakefile.am: Preserve the libANGLE.la dependency on the ANGLE's GNUmakefile.am.
+
2013-08-15 Allan Sandfeld Jensen <[email protected]>
ANGLE doesn't build with bison 3.0
Modified: trunk/Source/ThirdParty/ANGLE/GNUmakefile.am (154175 => 154176)
--- trunk/Source/ThirdParty/ANGLE/GNUmakefile.am 2013-08-16 11:50:50 UTC (rev 154175)
+++ trunk/Source/ThirdParty/ANGLE/GNUmakefile.am 2013-08-16 12:10:14 UTC (rev 154176)
@@ -15,6 +15,11 @@
-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR
+nodist_libANGLE_la_SOURCES = \
+ DerivedSources/ANGLE/glslang.cpp \
+ DerivedSources/ANGLE/glslang_tab.cpp \
+ DerivedSources/ANGLE/glslang_tab.h
+
libANGLE_la_SOURCES = \
Source/ThirdParty/ANGLE/include/EGL/egl.h \
Source/ThirdParty/ANGLE/include/EGL/eglplatform.h \
@@ -51,9 +56,6 @@
Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h \
Source/ThirdParty/ANGLE/src/compiler/glslang.h \
- Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp \
- Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp \
- Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h \
Source/ThirdParty/ANGLE/src/compiler/HashNames.h \
Source/ThirdParty/ANGLE/src/compiler/InfoSink.cpp \
Source/ThirdParty/ANGLE/src/compiler/InfoSink.h \
Modified: trunk/Source/WebCore/ChangeLog (154175 => 154176)
--- trunk/Source/WebCore/ChangeLog 2013-08-16 11:50:50 UTC (rev 154175)
+++ trunk/Source/WebCore/ChangeLog 2013-08-16 12:10:14 UTC (rev 154176)
@@ -1,3 +1,13 @@
+2013-08-16 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r153749.
+ http://trac.webkit.org/changeset/153749
+ https://bugs.webkit.org/show_bug.cgi?id=119892
+
+ The bison generation of the glslang* files has now been fixed. (Requested by zdobersek on #webkit).
+
+ * GNUmakefile.am:
+
2013-08-16 Danilo Cesar Lemes de Paula <[email protected]>
[GTK] fixing localizedString method name
Modified: trunk/Source/WebCore/GNUmakefile.am (154175 => 154176)
--- trunk/Source/WebCore/GNUmakefile.am 2013-08-16 11:50:50 UTC (rev 154175)
+++ trunk/Source/WebCore/GNUmakefile.am 2013-08-16 12:10:14 UTC (rev 154176)
@@ -350,6 +350,14 @@
dist_audio_DATA = $(audio_DATA)
endif # END ENABLE_WEB_AUDIO
+# ANGLE tokenizer & parser
+DerivedSources/ANGLE/glslang.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.l DerivedSources/ANGLE/glslang_tab.cpp
+ $(AM_V_GEN)$(FLEX) --noline --nounistd --outfile="$@" "$<"
+
+DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.y
+ $(AM_V_GEN)$(BISON) --no-lines --defines="DerivedSources/ANGLE/glslang_tab.h" --skeleton=yacc.c --output="$@" $<
+DerivedSources/ANGLE/glslang_tab.h: DerivedSources/ANGLE/glslang_tab.cpp
+
IDL_PATH := \
$(WebCore)/Modules/battery \
$(WebCore)/Modules/filesystem \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
