1 files changed, 26 insertions, 13 deletions
diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro
index 6f0128d6de..e9d16ca5af 100644
--- a/src/angle/src/compiler/translator.pro
+++ b/src/angle/src/compiler/translator.pro
@@ -1,14 +1,11 @@
 CONFIG += static
 include(../config.pri)
 
-# Mingw 4.7 chokes on implicit move semantics, so disable C++11 here
-mingw: CONFIG -= c++11
-
 INCLUDEPATH += \
     $$ANGLE_DIR/src \
     $$ANGLE_DIR/include
 
-DEFINES += _SECURE_SCL=0 _LIB COMPILER_IMPLEMENTATION
+DEFINES += _SECURE_SCL=0 _LIB ANGLE_TRANSLATOR_IMPLEMENTATION ANGLE_TRANSLATOR_STATIC ANGLE_ENABLE_HLSL
 
 FLEX_SOURCES = $$ANGLE_DIR/src/compiler/translator/glslang.l
 BISON_SOURCES = $$ANGLE_DIR/src/compiler/translator/glslang.y
@@ -23,26 +20,31 @@ HEADERS += \
     $$ANGLE_DIR/src/common/platform.h \
     $$ANGLE_DIR/src/common/tls.h \
     $$ANGLE_DIR/src/common/utilities.h \
+    $$ANGLE_DIR/src/compiler/translator/blocklayout.h \
+    $$ANGLE_DIR/src/compiler/translator/blocklayoutHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/BaseTypes.h \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulator.h \
+    $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorGLSL.h \
+    $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/Common.h \
-    $$ANGLE_DIR/src/compiler/translator/Compiler.h \
     $$ANGLE_DIR/src/compiler/translator/compilerdebug.h \
+    $$ANGLE_DIR/src/compiler/translator/Compiler.h \
     $$ANGLE_DIR/src/compiler/translator/ConstantUnion.h \
-    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraph.h \
     $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphBuilder.h \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraph.h \
     $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphOutput.h \
     $$ANGLE_DIR/src/compiler/translator/DetectCallDepth.h \
     $$ANGLE_DIR/src/compiler/translator/DetectDiscontinuity.h \
     $$ANGLE_DIR/src/compiler/translator/Diagnostics.h \
     $$ANGLE_DIR/src/compiler/translator/DirectiveHandler.h \
     $$ANGLE_DIR/src/compiler/translator/ExtensionBehavior.h \
+    $$ANGLE_DIR/src/compiler/translator/EmulatePrecision.h \
     $$ANGLE_DIR/src/compiler/translator/FlagStd140Structs.h \
     $$ANGLE_DIR/src/compiler/translator/ForLoopUnroll.h \
     $$ANGLE_DIR/src/compiler/translator/HashNames.h \
     $$ANGLE_DIR/src/compiler/translator/InfoSink.h \
-    $$ANGLE_DIR/src/compiler/translator/Initialize.h \
     $$ANGLE_DIR/src/compiler/translator/InitializeDll.h \
+    $$ANGLE_DIR/src/compiler/translator/Initialize.h \
     $$ANGLE_DIR/src/compiler/translator/InitializeParseContext.h \
     $$ANGLE_DIR/src/compiler/translator/InitializeVariables.h \
     $$ANGLE_DIR/src/compiler/translator/intermediate.h \
@@ -51,21 +53,23 @@ HEADERS += \
     $$ANGLE_DIR/src/compiler/translator/MMap.h \
     $$ANGLE_DIR/src/compiler/translator/NodeSearch.h \
     $$ANGLE_DIR/src/compiler/translator/osinclude.h \
+    $$ANGLE_DIR/src/compiler/translator/Operator.h \
     $$ANGLE_DIR/src/compiler/translator/OutputESSL.h \
-    $$ANGLE_DIR/src/compiler/translator/OutputGLSL.h \
     $$ANGLE_DIR/src/compiler/translator/OutputGLSLBase.h \
+    $$ANGLE_DIR/src/compiler/translator/OutputGLSL.h \
     $$ANGLE_DIR/src/compiler/translator/OutputHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/ParseContext.h \
     $$ANGLE_DIR/src/compiler/translator/PoolAlloc.h \
     $$ANGLE_DIR/src/compiler/translator/Pragma.h \
     $$ANGLE_DIR/src/compiler/translator/QualifierAlive.h \
     $$ANGLE_DIR/src/compiler/translator/RegenerateStructNames.h \
-    $$ANGLE_DIR/src/compiler/translator/RemoveTree.h \
+    $$ANGLE_DIR/src/compiler/translator/RemoveSwitchFallThrough.h \
     $$ANGLE_DIR/src/compiler/translator/RenameFunction.h \
     $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.h \
     $$ANGLE_DIR/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.h \
     $$ANGLE_DIR/src/compiler/translator/SearchSymbol.h \
     $$ANGLE_DIR/src/compiler/translator/ShHandle.h \
+    $$ANGLE_DIR/src/compiler/translator/SimplifyArrayAssignment.h \
     $$ANGLE_DIR/src/compiler/translator/StructureHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/SymbolTable.h \
     $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.h \
@@ -74,13 +78,14 @@ HEADERS += \
     $$ANGLE_DIR/src/compiler/translator/TranslatorGLSL.h \
     $$ANGLE_DIR/src/compiler/translator/TranslatorHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/Types.h \
-    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuit.h \
     $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitAST.h \
+    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuit.h \
     $$ANGLE_DIR/src/compiler/translator/UniformHLSL.h \
-    $$ANGLE_DIR/src/compiler/translator/UtilsHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/util.h \
+    $$ANGLE_DIR/src/compiler/translator/UtilsHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.h \
     $$ANGLE_DIR/src/compiler/translator/ValidateOutputs.h \
+    $$ANGLE_DIR/src/compiler/translator/ValidateSwitch.h \
     $$ANGLE_DIR/src/compiler/translator/VariableInfo.h \
     $$ANGLE_DIR/src/compiler/translator/VariablePacker.h \
     $$ANGLE_DIR/src/compiler/translator/VersionGLSL.h \
@@ -89,7 +94,11 @@ HEADERS += \
 
 SOURCES += \
     $$ANGLE_DIR/src/common/tls.cpp \
+    $$ANGLE_DIR/src/compiler/translator/blocklayout.cpp \
+    $$ANGLE_DIR/src/compiler/translator/blocklayoutHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulator.cpp \
+    $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/CodeGen.cpp \
     $$ANGLE_DIR/src/compiler/translator/Compiler.cpp \
     $$ANGLE_DIR/src/compiler/translator/compilerdebug.cpp \
@@ -101,6 +110,7 @@ SOURCES += \
     $$ANGLE_DIR/src/compiler/translator/DetectDiscontinuity.cpp \
     $$ANGLE_DIR/src/compiler/translator/Diagnostics.cpp \
     $$ANGLE_DIR/src/compiler/translator/DirectiveHandler.cpp \
+    $$ANGLE_DIR/src/compiler/translator/EmulatePrecision.cpp \
     $$ANGLE_DIR/src/compiler/translator/FlagStd140Structs.cpp \
     $$ANGLE_DIR/src/compiler/translator/ForLoopUnroll.cpp \
     $$ANGLE_DIR/src/compiler/translator/InfoSink.cpp \
@@ -113,6 +123,7 @@ SOURCES += \
     $$ANGLE_DIR/src/compiler/translator/intermOut.cpp \
     $$ANGLE_DIR/src/compiler/translator/IntermTraverse.cpp \
     $$ANGLE_DIR/src/compiler/translator/LoopInfo.cpp \
+    $$ANGLE_DIR/src/compiler/translator/Operator.cpp \
     $$ANGLE_DIR/src/compiler/translator/OutputESSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/OutputGLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/OutputGLSLBase.cpp \
@@ -122,12 +133,13 @@ SOURCES += \
     $$ANGLE_DIR/src/compiler/translator/PoolAlloc.cpp \
     $$ANGLE_DIR/src/compiler/translator/QualifierAlive.cpp \
     $$ANGLE_DIR/src/compiler/translator/RegenerateStructNames.cpp \
-    $$ANGLE_DIR/src/compiler/translator/RemoveTree.cpp \
+    $$ANGLE_DIR/src/compiler/translator/RemoveSwitchFallThrough.cpp \
     $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.cpp \
     $$ANGLE_DIR/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp \
     $$ANGLE_DIR/src/compiler/translator/SearchSymbol.cpp \
     $$ANGLE_DIR/src/compiler/translator/ShaderLang.cpp \
     $$ANGLE_DIR/src/compiler/translator/ShaderVars.cpp \
+    $$ANGLE_DIR/src/compiler/translator/SimplifyArrayAssignment.cpp \
     $$ANGLE_DIR/src/compiler/translator/StructureHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/SymbolTable.cpp \
     $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp \
@@ -143,6 +155,7 @@ SOURCES += \
     $$ANGLE_DIR/src/compiler/translator/util.cpp \
     $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.cpp \
     $$ANGLE_DIR/src/compiler/translator/ValidateOutputs.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ValidateSwitch.cpp \
     $$ANGLE_DIR/src/compiler/translator/VariableInfo.cpp \
     $$ANGLE_DIR/src/compiler/translator/VariablePacker.cpp \
     $$ANGLE_DIR/src/compiler/translator/VersionGLSL.cpp \
@@ -157,7 +170,7 @@ flex.dependency_type = TYPE_C
 flex.variable_out = GENERATED_SOURCES
 QMAKE_EXTRA_COMPILERS += flex
 
-bison.commands = $$addGnuPath(bison) --no-lines --skeleton=yacc.c --defines=${QMAKE_FILE_BASE}_tab.h \
+bison.commands = $$addGnuPath(win_bison) --no-lines --skeleton=yacc.c --defines=${QMAKE_FILE_BASE}_tab.h \
                 --output=${QMAKE_FILE_BASE}_tab.cpp ${QMAKE_FILE_NAME}
 bison.output = ${QMAKE_FILE_BASE}_tab.h
 bison.input = BISON_SOURCES