Title: [104385] trunk/Source/WebCore
- Revision
- 104385
- Author
- [email protected]
- Date
- 2012-01-07 07:22:04 -0800 (Sat, 07 Jan 2012)
Log Message
2012-01-07 Chris Marrin <[email protected]>
Fixed ANGLE build for GNU and QT broken in https://trac.webkit.org/changeset/104363
Unreviewed.
* GNUmakefile.list.am:
* Target.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104384 => 104385)
--- trunk/Source/WebCore/ChangeLog 2012-01-07 10:08:46 UTC (rev 104384)
+++ trunk/Source/WebCore/ChangeLog 2012-01-07 15:22:04 UTC (rev 104385)
@@ -1,3 +1,12 @@
+2012-01-07 Chris Marrin <[email protected]>
+
+ Fixed ANGLE build for GNU and QT broken in https://trac.webkit.org/changeset/104363
+
+ Unreviewed.
+
+ * GNUmakefile.list.am:
+ * Target.pri:
+
2012-01-07 Andreas Kling <[email protected]>
Unreviewed C++ bindings build fix after r104383.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (104384 => 104385)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-01-07 10:08:46 UTC (rev 104384)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-01-07 15:22:04 UTC (rev 104385)
@@ -5455,12 +5455,16 @@
webcore_sources += \
Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h \
Source/ThirdParty/ANGLE/src/compiler/BaseTypes.h \
+ Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.cpp \
+ Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.h \
Source/ThirdParty/ANGLE/src/compiler/CodeGenGLSL.cpp \
Source/ThirdParty/ANGLE/src/compiler/Common.h \
Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp \
Source/ThirdParty/ANGLE/src/compiler/ConstantUnion.h \
Source/ThirdParty/ANGLE/src/compiler/debug.cpp \
Source/ThirdParty/ANGLE/src/compiler/debug.h \
+ Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.cpp \
+ Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.h \
Source/ThirdParty/ANGLE/src/compiler/ExtensionBehavior.h \
Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h \
@@ -5502,6 +5506,7 @@
Source/ThirdParty/ANGLE/src/compiler/preprocessor/cpp.c \
Source/ThirdParty/ANGLE/src/compiler/preprocessor/cpp.h \
Source/ThirdParty/ANGLE/src/compiler/preprocessor/cppstruct.c \
+ Source/ThirdParty/ANGLE/src/compiler/preprocessor/length_limits.h \
Source/ThirdParty/ANGLE/src/compiler/preprocessor/memory.c \
Source/ThirdParty/ANGLE/src/compiler/preprocessor/memory.h \
Source/ThirdParty/ANGLE/src/compiler/preprocessor/parser.h \
Modified: trunk/Source/WebCore/Target.pri (104384 => 104385)
--- trunk/Source/WebCore/Target.pri 2012-01-07 10:08:46 UTC (rev 104384)
+++ trunk/Source/WebCore/Target.pri 2012-01-07 15:22:04 UTC (rev 104385)
@@ -3735,9 +3735,11 @@
ANGLE_HEADERS += \
$$ANGLE_DIR/src/compiler/BaseTypes.h \
+ $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.h \
$$ANGLE_DIR/src/compiler/Common.h \
$$ANGLE_DIR/src/compiler/ConstantUnion.h \
$$ANGLE_DIR/src/compiler/debug.h \
+ $$ANGLE_DIR/src/compiler/DetectRecursion.h \
$$ANGLE_DIR/src/compiler/ExtensionBehavior.h \
$$ANGLE_DIR/src/compiler/ForLoopUnroll.h \
$$ANGLE_DIR/src/compiler/glslang.h \
@@ -3755,6 +3757,7 @@
$$ANGLE_DIR/src/compiler/preprocessor/atom.h \
$$ANGLE_DIR/src/compiler/preprocessor/compile.h \
$$ANGLE_DIR/src/compiler/preprocessor/cpp.h \
+ $$ANGLE_DIR/src/compiler/preprocessor/length_limits.h \
$$ANGLE_DIR/src/compiler/preprocessor/memory.h \
$$ANGLE_DIR/src/compiler/preprocessor/parser.h \
$$ANGLE_DIR/src/compiler/preprocessor/preprocess.h \
@@ -3786,9 +3789,11 @@
HEADERS += $$ANGLE_HEADERS
ANGLE_SOURCES += \
+ $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.cpp \
$$ANGLE_DIR/src/compiler/CodeGenGLSL.cpp \
$$ANGLE_DIR/src/compiler/Compiler.cpp \
$$ANGLE_DIR/src/compiler/debug.cpp \
+ $$ANGLE_DIR/src/compiler/DetectRecursion.cpp \
$$ANGLE_DIR/src/compiler/ForLoopUnroll.cpp \
$$ANGLE_DIR/src/compiler/glslang_lex.cpp \
$$ANGLE_DIR/src/compiler/glslang_tab.cpp \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
