Changeset 104385 in webkit


Ignore:
Timestamp:
Jan 7, 2012 7:22:04 AM (12 years ago)
Author:
cmarrin@apple.com
Message:

2012-01-07 Chris Marrin <cmarrin@apple.com>

Fixed ANGLE build for GNU and QT broken in https://trac.webkit.org/changeset/104363

Unreviewed.

  • GNUmakefile.list.am:
  • Target.pri:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r104384 r104385  
     12012-01-07  Chris Marrin  <cmarrin@apple.com>
     2
     3        Fixed ANGLE build for GNU and QT broken in https://trac.webkit.org/changeset/104363
     4
     5        Unreviewed.
     6
     7        * GNUmakefile.list.am:
     8        * Target.pri:
     9
    1102012-01-07  Andreas Kling  <awesomekling@apple.com>
    211
  • trunk/Source/WebCore/GNUmakefile.list.am

    r104380 r104385  
    54565456        Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h \
    54575457        Source/ThirdParty/ANGLE/src/compiler/BaseTypes.h \
     5458        Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.cpp \
     5459        Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.h \
    54585460        Source/ThirdParty/ANGLE/src/compiler/CodeGenGLSL.cpp \
    54595461        Source/ThirdParty/ANGLE/src/compiler/Common.h \
     
    54625464        Source/ThirdParty/ANGLE/src/compiler/debug.cpp \
    54635465        Source/ThirdParty/ANGLE/src/compiler/debug.h \
     5466        Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.cpp \
     5467        Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.h \
    54645468        Source/ThirdParty/ANGLE/src/compiler/ExtensionBehavior.h \
    54655469        Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
     
    55035507        Source/ThirdParty/ANGLE/src/compiler/preprocessor/cpp.h \
    55045508        Source/ThirdParty/ANGLE/src/compiler/preprocessor/cppstruct.c \
     5509        Source/ThirdParty/ANGLE/src/compiler/preprocessor/length_limits.h \
    55055510        Source/ThirdParty/ANGLE/src/compiler/preprocessor/memory.c \
    55065511        Source/ThirdParty/ANGLE/src/compiler/preprocessor/memory.h \
  • trunk/Source/WebCore/Target.pri

    r104380 r104385  
    37363736        ANGLE_HEADERS += \
    37373737            $$ANGLE_DIR/src/compiler/BaseTypes.h \
     3738            $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.h \
    37383739            $$ANGLE_DIR/src/compiler/Common.h \
    37393740            $$ANGLE_DIR/src/compiler/ConstantUnion.h \
    37403741            $$ANGLE_DIR/src/compiler/debug.h \
     3742            $$ANGLE_DIR/src/compiler/DetectRecursion.h \
    37413743            $$ANGLE_DIR/src/compiler/ExtensionBehavior.h \
    37423744            $$ANGLE_DIR/src/compiler/ForLoopUnroll.h \
     
    37563758            $$ANGLE_DIR/src/compiler/preprocessor/compile.h \
    37573759            $$ANGLE_DIR/src/compiler/preprocessor/cpp.h \
     3760            $$ANGLE_DIR/src/compiler/preprocessor/length_limits.h \
    37583761            $$ANGLE_DIR/src/compiler/preprocessor/memory.h \
    37593762            $$ANGLE_DIR/src/compiler/preprocessor/parser.h \
     
    37873790
    37883791        ANGLE_SOURCES += \
     3792            $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.cpp \
    37893793            $$ANGLE_DIR/src/compiler/CodeGenGLSL.cpp \
    37903794            $$ANGLE_DIR/src/compiler/Compiler.cpp \
    37913795            $$ANGLE_DIR/src/compiler/debug.cpp \
     3796            $$ANGLE_DIR/src/compiler/DetectRecursion.cpp \
    37923797            $$ANGLE_DIR/src/compiler/ForLoopUnroll.cpp \
    37933798            $$ANGLE_DIR/src/compiler/glslang_lex.cpp \
Note: See TracChangeset for help on using the changeset viewer.