| Differences between
and this patch
- a/Source/ThirdParty/ANGLE/ChangeLog +8 lines
Lines 1-3 a/Source/ThirdParty/ANGLE/ChangeLog_sec1
1
2013-08-16  Commit Queue  <commit-queue@webkit.org>
2
3
        <Need the bug URL (OOPS!)> Need a short description (OOPS!)
4
5
        Reviewed by NOBODY (OOPS!).
6
7
        * GNUmakefile.am:
8
1
2013-08-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
9
2013-08-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
2
10
3
        ANGLE doesn't build with bison 3.0
11
        ANGLE doesn't build with bison 3.0
- a/Source/WebCore/ChangeLog +10 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1
2013-08-16  Commit Queue  <commit-queue@webkit.org>
2
3
        <Need the bug URL (OOPS!)> Need a short description (OOPS!)
4
5
        Reviewed by NOBODY (OOPS!).
6
7
        No new tests (OOPS!).
8
9
        * GNUmakefile.am:
10
1
2013-08-16  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
11
2013-08-16  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
2
12
3
        <https://webkit.org/b/119885> [CMake] Always build our generated versions of ANGLE's glslang.cpp and glslang_tab.cpp
13
        <https://webkit.org/b/119885> [CMake] Always build our generated versions of ANGLE's glslang.cpp and glslang_tab.cpp
- a/Source/ThirdParty/ANGLE/GNUmakefile.am -6 / +5 lines
Lines 1-9 a/Source/ThirdParty/ANGLE/GNUmakefile.am_sec1
1
if USE_OPENGL
1
if USE_OPENGL
2
noinst_LTLIBRARIES += \
2
noinst_LTLIBRARIES += \
3
	libANGLE.la
3
	libANGLE.la
4
5
angle_lib_for_dep = libANGLE.la
6
$(angle_lib_for_dep): $(srcdir)/Source/ThirdParty/ANGLE/GNUmakefile.am
7
endif
4
endif
8
5
9
libANGLE_la_CXXFLAGS = $(global_cxxflags)
6
libANGLE_la_CXXFLAGS = $(global_cxxflags)
Lines 15-20 libANGLE_la_CPPFLAGS = \ a/Source/ThirdParty/ANGLE/GNUmakefile.am_sec2
15
	-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
12
	-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
16
	-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR
13
	-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR
17
14
15
nodist_libANGLE_la_SOURCES = \
16
	DerivedSources/ANGLE/glslang.cpp \
17
	DerivedSources/ANGLE/glslang_tab.cpp \
18
	DerivedSources/ANGLE/glslang_tab.h
19
18
libANGLE_la_SOURCES = \
20
libANGLE_la_SOURCES = \
19
	Source/ThirdParty/ANGLE/include/EGL/egl.h \
21
	Source/ThirdParty/ANGLE/include/EGL/egl.h \
20
	Source/ThirdParty/ANGLE/include/EGL/eglplatform.h \
22
	Source/ThirdParty/ANGLE/include/EGL/eglplatform.h \
Lines 51-59 libANGLE_la_SOURCES = \ a/Source/ThirdParty/ANGLE/GNUmakefile.am_sec3
51
	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
53
	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
52
	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h \
54
	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h \
53
	Source/ThirdParty/ANGLE/src/compiler/glslang.h \
55
	Source/ThirdParty/ANGLE/src/compiler/glslang.h \
54
	Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp \
55
	Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp \
56
	Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h \
57
	Source/ThirdParty/ANGLE/src/compiler/HashNames.h \
56
	Source/ThirdParty/ANGLE/src/compiler/HashNames.h \
58
	Source/ThirdParty/ANGLE/src/compiler/InfoSink.cpp \
57
	Source/ThirdParty/ANGLE/src/compiler/InfoSink.cpp \
59
	Source/ThirdParty/ANGLE/src/compiler/InfoSink.h \
58
	Source/ThirdParty/ANGLE/src/compiler/InfoSink.h \
- a/Source/WebCore/GNUmakefile.am +8 lines
Lines 350-355 audio_DATA = $(WebCore)/platform/audio/resources/Composite.wav a/Source/WebCore/GNUmakefile.am_sec1
350
dist_audio_DATA = $(audio_DATA)
350
dist_audio_DATA = $(audio_DATA)
351
endif  # END ENABLE_WEB_AUDIO
351
endif  # END ENABLE_WEB_AUDIO
352
352
353
# ANGLE tokenizer & parser
354
DerivedSources/ANGLE/glslang.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.l DerivedSources/ANGLE/glslang_tab.cpp
355
	$(AM_V_GEN)$(FLEX) --noline --nounistd --outfile="$@" "$<"
356
357
DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.y
358
	$(AM_V_GEN)$(BISON) --no-lines --defines="DerivedSources/ANGLE/glslang_tab.h" --skeleton=yacc.c --output="$@" $<
359
DerivedSources/ANGLE/glslang_tab.h: DerivedSources/ANGLE/glslang_tab.cpp
360
353
IDL_PATH := \
361
IDL_PATH := \
354
    $(WebCore)/Modules/battery \
362
    $(WebCore)/Modules/battery \
355
    $(WebCore)/Modules/filesystem \
363
    $(WebCore)/Modules/filesystem \

Return to Bug 119892