Bug 1037667 - Update generated ANGLE moz.build files to fix DX SDK build issues. r=jrmuizel, a=sledru
authorVladimir Vukicevic <vladimir@pobox.com>
Tue, 22 Jul 2014 21:38:23 -0400
changeset 216909 1930a7b3c014
parent 216908 7a21538bedac
child 216910 abc995cad178
push id3962
push userryanvm@gmail.com
push date2014-10-02 13:26 +0000
treeherdermozilla-beta@abc995cad178 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, sledru
bugs1037667
milestone33.0
Bug 1037667 - Update generated ANGLE moz.build files to fix DX SDK build issues. r=jrmuizel, a=sledru
gfx/angle/moz.build
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/moz.build
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -1,149 +1,154 @@
-
-# Please note this file is autogenerated from generate_mozbuild.py, so do not modify it directly
-
-UNIFIED_SOURCES += [
-    'src/common/blocklayout.cpp',
-    'src/common/debug.cpp',
-    'src/common/event_tracer.cpp',
-    'src/common/mathutil.cpp',
-    'src/common/RefCountObject.cpp',
-    'src/common/utilities.cpp',
-    'src/compiler/preprocessor/DiagnosticsBase.cpp',
-    'src/compiler/preprocessor/DirectiveHandlerBase.cpp',
-    'src/compiler/preprocessor/DirectiveParser.cpp',
-    'src/compiler/preprocessor/ExpressionParser.cpp',
-    'src/compiler/preprocessor/Input.cpp',
-    'src/compiler/preprocessor/Lexer.cpp',
-    'src/compiler/preprocessor/Macro.cpp',
-    'src/compiler/preprocessor/MacroExpander.cpp',
-    'src/compiler/preprocessor/Preprocessor.cpp',
-    'src/compiler/preprocessor/Token.cpp',
-    'src/compiler/preprocessor/Tokenizer.cpp',
-    'src/compiler/translator/BuiltInFunctionEmulator.cpp',
-    'src/compiler/translator/CodeGen.cpp',
-    'src/compiler/translator/Compiler.cpp',
-    'src/compiler/translator/compilerdebug.cpp',
-    'src/compiler/translator/depgraph/DependencyGraph.cpp',
-    'src/compiler/translator/depgraph/DependencyGraphBuilder.cpp',
-    'src/compiler/translator/depgraph/DependencyGraphOutput.cpp',
-    'src/compiler/translator/depgraph/DependencyGraphTraverse.cpp',
-    'src/compiler/translator/DetectCallDepth.cpp',
-    'src/compiler/translator/DetectDiscontinuity.cpp',
-    'src/compiler/translator/Diagnostics.cpp',
-    'src/compiler/translator/DirectiveHandler.cpp',
-    'src/compiler/translator/FlagStd140Structs.cpp',
-    'src/compiler/translator/ForLoopUnroll.cpp',
-    'src/compiler/translator/InfoSink.cpp',
-    'src/compiler/translator/Initialize.cpp',
-    'src/compiler/translator/InitializeDll.cpp',
-    'src/compiler/translator/InitializeParseContext.cpp',
-    'src/compiler/translator/InitializeVariables.cpp',
-    'src/compiler/translator/Intermediate.cpp',
-    'src/compiler/translator/intermOut.cpp',
-    'src/compiler/translator/IntermTraverse.cpp',
-    'src/compiler/translator/LoopInfo.cpp',
-    'src/compiler/translator/OutputESSL.cpp',
-    'src/compiler/translator/OutputGLSL.cpp',
-    'src/compiler/translator/OutputGLSLBase.cpp',
-    'src/compiler/translator/OutputHLSL.cpp',
-    'src/compiler/translator/parseConst.cpp',
-    'src/compiler/translator/ParseContext.cpp',
-    'src/compiler/translator/PoolAlloc.cpp',
-    'src/compiler/translator/QualifierAlive.cpp',
-    'src/compiler/translator/RemoveTree.cpp',
-    'src/compiler/translator/RewriteElseBlocks.cpp',
-    'src/compiler/translator/SearchSymbol.cpp',
-    'src/compiler/translator/ShaderLang.cpp',
-    'src/compiler/translator/SymbolTable.cpp',
-    'src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp',
-    'src/compiler/translator/timing/RestrictVertexShaderTiming.cpp',
-    'src/compiler/translator/TranslatorESSL.cpp',
-    'src/compiler/translator/TranslatorGLSL.cpp',
-    'src/compiler/translator/TranslatorHLSL.cpp',
-    'src/compiler/translator/Types.cpp',
-    'src/compiler/translator/UnfoldShortCircuit.cpp',
-    'src/compiler/translator/UnfoldShortCircuitAST.cpp',
-    'src/compiler/translator/util.cpp',
-    'src/compiler/translator/ValidateLimitations.cpp',
-    'src/compiler/translator/ValidateOutputs.cpp',
-    'src/compiler/translator/VariableInfo.cpp',
-    'src/compiler/translator/VariablePacker.cpp',
-    'src/compiler/translator/VersionGLSL.cpp',
-    'src/third_party/compiler/ArrayBoundsClamper.cpp',
-]
-SOURCES += [
-    'src/compiler/translator/glslang_lex.cpp',
-    'src/compiler/translator/glslang_tab.cpp',
-]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
-    UNIFIED_SOURCES += [
-        'src/compiler/translator/ossource_posix.cpp',
-    ]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += [
-        'src/compiler/translator/ossource_posix.cpp',
-    ]
-if CONFIG['MOZ_WIDGET_GTK']:
-    UNIFIED_SOURCES += [
-        'src/compiler/translator/ossource_posix.cpp',
-    ]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
-    UNIFIED_SOURCES += [
-        'src/compiler/translator/ossource_posix.cpp',
-    ]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    UNIFIED_SOURCES += [
-        'src/compiler/translator/ossource_win.cpp',
-    ]
-
-
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += [
-        '-Wno-attributes',
-        '-Wno-sign-compare',
-        '-Wno-unknown-pragmas',
-    ]
-    if CONFIG['CLANG_CXX']:
-        CXXFLAGS += ['-Wno-unused-private-field']
-
-DEFINES['NOMINMAX'] = True
-DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
-DEFINES['_HAS_EXCEPTIONS'] = 0
-
-if not CONFIG['MOZ_DEBUG']:
-    DEFINES['_SECURE_SCL'] = 0
-
-DEFINES['ANGLE_ENABLE_D3D9'] = True
-DEFINES['ANGLE_ENABLE_D3D11'] = True
-DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
-DEFINES['ANGLE_NO_EXCEPTIONS'] = True
-
-# We need these defined to nothing so that we don't get bogus dllimport declspecs
-DEFINES['GL_APICALL'] = ""
-DEFINES['GL_GLEXT_PROTOTYPES'] = ""
-DEFINES['EGLAPI'] = ""
-
-# ANGLE uses the STL, so we can't use our derpy STL wrappers.
-DISABLE_STL_WRAPPING = True
-
-
-# Only build libEGL/libGLESv2 on Windows
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    DIRS += [ 'src/libGLESv2', 'src/libEGL' ]
-
-EXPORTS.angle += [ 'include/GLSLANG/ShaderLang.h' ]
-EXPORTS.angle.KHR += [ 'include/KHR/khrplatform.h' ]
-
-LOCAL_INCLUDES += [ 'include', 'src' ]
-
-MSVC_ENABLE_PGO = True
-
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    NO_VISIBILITY_FLAGS = True
-
-# This tells ANGLE to build the translator with declspec(dllexport) on Windows
-# which we need to get these symbols exported from gkmedias
-DEFINES['COMPONENT_BUILD'] = True
-DEFINES['ANGLE_TRANSLATOR_IMPLEMENTATION'] = True
-
-FINAL_LIBRARY = 'gkmedias'
+
+# Please note this file is autogenerated from generate_mozbuild.py, so do not modify it directly
+
+UNIFIED_SOURCES += [
+    'src/common/blocklayout.cpp',
+    'src/common/debug.cpp',
+    'src/common/event_tracer.cpp',
+    'src/common/mathutil.cpp',
+    'src/common/RefCountObject.cpp',
+    'src/common/utilities.cpp',
+    'src/compiler/preprocessor/DiagnosticsBase.cpp',
+    'src/compiler/preprocessor/DirectiveHandlerBase.cpp',
+    'src/compiler/preprocessor/DirectiveParser.cpp',
+    'src/compiler/preprocessor/ExpressionParser.cpp',
+    'src/compiler/preprocessor/Input.cpp',
+    'src/compiler/preprocessor/Lexer.cpp',
+    'src/compiler/preprocessor/Macro.cpp',
+    'src/compiler/preprocessor/MacroExpander.cpp',
+    'src/compiler/preprocessor/Preprocessor.cpp',
+    'src/compiler/preprocessor/Token.cpp',
+    'src/compiler/preprocessor/Tokenizer.cpp',
+    'src/compiler/translator/BuiltInFunctionEmulator.cpp',
+    'src/compiler/translator/CodeGen.cpp',
+    'src/compiler/translator/Compiler.cpp',
+    'src/compiler/translator/compilerdebug.cpp',
+    'src/compiler/translator/depgraph/DependencyGraph.cpp',
+    'src/compiler/translator/depgraph/DependencyGraphBuilder.cpp',
+    'src/compiler/translator/depgraph/DependencyGraphOutput.cpp',
+    'src/compiler/translator/depgraph/DependencyGraphTraverse.cpp',
+    'src/compiler/translator/DetectCallDepth.cpp',
+    'src/compiler/translator/DetectDiscontinuity.cpp',
+    'src/compiler/translator/Diagnostics.cpp',
+    'src/compiler/translator/DirectiveHandler.cpp',
+    'src/compiler/translator/FlagStd140Structs.cpp',
+    'src/compiler/translator/ForLoopUnroll.cpp',
+    'src/compiler/translator/InfoSink.cpp',
+    'src/compiler/translator/Initialize.cpp',
+    'src/compiler/translator/InitializeDll.cpp',
+    'src/compiler/translator/InitializeParseContext.cpp',
+    'src/compiler/translator/InitializeVariables.cpp',
+    'src/compiler/translator/Intermediate.cpp',
+    'src/compiler/translator/intermOut.cpp',
+    'src/compiler/translator/IntermTraverse.cpp',
+    'src/compiler/translator/LoopInfo.cpp',
+    'src/compiler/translator/OutputESSL.cpp',
+    'src/compiler/translator/OutputGLSL.cpp',
+    'src/compiler/translator/OutputGLSLBase.cpp',
+    'src/compiler/translator/OutputHLSL.cpp',
+    'src/compiler/translator/parseConst.cpp',
+    'src/compiler/translator/ParseContext.cpp',
+    'src/compiler/translator/PoolAlloc.cpp',
+    'src/compiler/translator/QualifierAlive.cpp',
+    'src/compiler/translator/RemoveTree.cpp',
+    'src/compiler/translator/RewriteElseBlocks.cpp',
+    'src/compiler/translator/SearchSymbol.cpp',
+    'src/compiler/translator/ShaderLang.cpp',
+    'src/compiler/translator/SymbolTable.cpp',
+    'src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp',
+    'src/compiler/translator/timing/RestrictVertexShaderTiming.cpp',
+    'src/compiler/translator/TranslatorESSL.cpp',
+    'src/compiler/translator/TranslatorGLSL.cpp',
+    'src/compiler/translator/TranslatorHLSL.cpp',
+    'src/compiler/translator/Types.cpp',
+    'src/compiler/translator/UnfoldShortCircuit.cpp',
+    'src/compiler/translator/UnfoldShortCircuitAST.cpp',
+    'src/compiler/translator/util.cpp',
+    'src/compiler/translator/ValidateLimitations.cpp',
+    'src/compiler/translator/ValidateOutputs.cpp',
+    'src/compiler/translator/VariableInfo.cpp',
+    'src/compiler/translator/VariablePacker.cpp',
+    'src/compiler/translator/VersionGLSL.cpp',
+    'src/third_party/compiler/ArrayBoundsClamper.cpp',
+]
+SOURCES += [
+    'src/compiler/translator/glslang_lex.cpp',
+    'src/compiler/translator/glslang_tab.cpp',
+]
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
+    UNIFIED_SOURCES += [
+        'src/compiler/translator/ossource_posix.cpp',
+    ]
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    UNIFIED_SOURCES += [
+        'src/compiler/translator/ossource_posix.cpp',
+    ]
+if CONFIG['MOZ_WIDGET_GTK']:
+    UNIFIED_SOURCES += [
+        'src/compiler/translator/ossource_posix.cpp',
+    ]
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+    UNIFIED_SOURCES += [
+        'src/compiler/translator/ossource_posix.cpp',
+    ]
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    UNIFIED_SOURCES += [
+        'src/compiler/translator/ossource_win.cpp',
+    ]
+
+
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += [
+        '-Wno-attributes',
+        '-Wno-sign-compare',
+        '-Wno-unknown-pragmas',
+    ]
+    if CONFIG['CLANG_CXX']:
+        CXXFLAGS += ['-Wno-unused-private-field']
+
+if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']]
+
+DEFINES['NOMINMAX'] = True
+DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
+DEFINES['_HAS_EXCEPTIONS'] = 0
+
+if not CONFIG['MOZ_DEBUG']:
+    DEFINES['_SECURE_SCL'] = 0
+
+DEFINES['ANGLE_ENABLE_D3D9'] = True
+if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    DEFINES['ANGLE_ENABLE_D3D11'] = True
+
+DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
+DEFINES['ANGLE_NO_EXCEPTIONS'] = True
+
+# We need these defined to nothing so that we don't get bogus dllimport declspecs
+DEFINES['GL_APICALL'] = ""
+DEFINES['GL_GLEXT_PROTOTYPES'] = ""
+DEFINES['EGLAPI'] = ""
+
+# ANGLE uses the STL, so we can't use our derpy STL wrappers.
+DISABLE_STL_WRAPPING = True
+
+
+# Only build libEGL/libGLESv2 on Windows
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    DIRS += [ 'src/libGLESv2', 'src/libEGL' ]
+
+EXPORTS.angle += [ 'include/GLSLANG/ShaderLang.h' ]
+EXPORTS.angle.KHR += [ 'include/KHR/khrplatform.h' ]
+
+LOCAL_INCLUDES += [ 'include', 'src' ]
+
+MSVC_ENABLE_PGO = True
+
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
+# This tells ANGLE to build the translator with declspec(dllexport) on Windows
+# which we need to get these symbols exported from gkmedias
+DEFINES['COMPONENT_BUILD'] = True
+DEFINES['ANGLE_TRANSLATOR_IMPLEMENTATION'] = True
+
+FINAL_LIBRARY = 'gkmedias'
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -1,56 +1,61 @@
-
-# Please note this file is autogenerated from generate_mozbuild.py, so do not modify it directly
-
-UNIFIED_SOURCES += [
-    '../common/blocklayout.cpp',
-    '../common/debug.cpp',
-    '../common/event_tracer.cpp',
-    '../common/mathutil.cpp',
-    '../common/RefCountObject.cpp',
-    '../common/utilities.cpp',
-    'Config.cpp',
-    'Display.cpp',
-    'libEGL.cpp',
-    'main.cpp',
-    'Surface.cpp',
-]
-
-
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += [
-        '-Wno-attributes',
-        '-Wno-sign-compare',
-        '-Wno-unknown-pragmas',
-    ]
-    if CONFIG['CLANG_CXX']:
-        CXXFLAGS += ['-Wno-unused-private-field']
-
-DEFINES['NOMINMAX'] = True
-DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
-DEFINES['_HAS_EXCEPTIONS'] = 0
-
-if not CONFIG['MOZ_DEBUG']:
-    DEFINES['_SECURE_SCL'] = 0
-
-DEFINES['ANGLE_ENABLE_D3D9'] = True
-DEFINES['ANGLE_ENABLE_D3D11'] = True
-DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
-DEFINES['ANGLE_NO_EXCEPTIONS'] = True
-
-# We need these defined to nothing so that we don't get bogus dllimport declspecs
-DEFINES['GL_APICALL'] = ""
-DEFINES['GL_GLEXT_PROTOTYPES'] = ""
-DEFINES['EGLAPI'] = ""
-
-# ANGLE uses the STL, so we can't use our derpy STL wrappers.
-DISABLE_STL_WRAPPING = True
-
-
-LOCAL_INCLUDES += [ '../../include', '../../src' ]
-EXTRA_DSO_LDOPTS += [ '../libGLESv2/libGLESv2.lib' ]
-
-LIBRARY_NAME = 'libEGL'
-FORCE_SHARED_LIB = True
-
-RCFILE = SRCDIR + '/libEGL.rc'
-DEFFILE = SRCDIR + '/libEGL.def'
+
+# Please note this file is autogenerated from generate_mozbuild.py, so do not modify it directly
+
+UNIFIED_SOURCES += [
+    '../common/blocklayout.cpp',
+    '../common/debug.cpp',
+    '../common/event_tracer.cpp',
+    '../common/mathutil.cpp',
+    '../common/RefCountObject.cpp',
+    '../common/utilities.cpp',
+    'Config.cpp',
+    'Display.cpp',
+    'libEGL.cpp',
+    'main.cpp',
+    'Surface.cpp',
+]
+
+
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += [
+        '-Wno-attributes',
+        '-Wno-sign-compare',
+        '-Wno-unknown-pragmas',
+    ]
+    if CONFIG['CLANG_CXX']:
+        CXXFLAGS += ['-Wno-unused-private-field']
+
+if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']]
+
+DEFINES['NOMINMAX'] = True
+DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
+DEFINES['_HAS_EXCEPTIONS'] = 0
+
+if not CONFIG['MOZ_DEBUG']:
+    DEFINES['_SECURE_SCL'] = 0
+
+DEFINES['ANGLE_ENABLE_D3D9'] = True
+if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    DEFINES['ANGLE_ENABLE_D3D11'] = True
+
+DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
+DEFINES['ANGLE_NO_EXCEPTIONS'] = True
+
+# We need these defined to nothing so that we don't get bogus dllimport declspecs
+DEFINES['GL_APICALL'] = ""
+DEFINES['GL_GLEXT_PROTOTYPES'] = ""
+DEFINES['EGLAPI'] = ""
+
+# ANGLE uses the STL, so we can't use our derpy STL wrappers.
+DISABLE_STL_WRAPPING = True
+
+
+LOCAL_INCLUDES += [ '../../include', '../../src' ]
+EXTRA_DSO_LDOPTS += [ '../libGLESv2/libGLESv2.lib' ]
+
+LIBRARY_NAME = 'libEGL'
+FORCE_SHARED_LIB = True
+
+RCFILE = SRCDIR + '/libEGL.rc'
+DEFFILE = SRCDIR + '/libEGL.def'
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -1,198 +1,214 @@
-
-# Please note this file is autogenerated from generate_mozbuild.py, so do not modify it directly
-
-UNIFIED_SOURCES += [
-    '../common/blocklayout.cpp',
-    '../common/debug.cpp',
-    '../common/event_tracer.cpp',
-    '../common/mathutil.cpp',
-    '../common/RefCountObject.cpp',
-    '../common/utilities.cpp',
-    '../compiler/preprocessor/DiagnosticsBase.cpp',
-    '../compiler/preprocessor/DirectiveHandlerBase.cpp',
-    '../compiler/preprocessor/DirectiveParser.cpp',
-    '../compiler/preprocessor/ExpressionParser.cpp',
-    '../compiler/preprocessor/Input.cpp',
-    '../compiler/preprocessor/Lexer.cpp',
-    '../compiler/preprocessor/Macro.cpp',
-    '../compiler/preprocessor/MacroExpander.cpp',
-    '../compiler/preprocessor/Preprocessor.cpp',
-    '../compiler/preprocessor/Token.cpp',
-    '../compiler/preprocessor/Tokenizer.cpp',
-    '../compiler/translator/BuiltInFunctionEmulator.cpp',
-    '../compiler/translator/CodeGen.cpp',
-    '../compiler/translator/Compiler.cpp',
-    '../compiler/translator/compilerdebug.cpp',
-    '../compiler/translator/depgraph/DependencyGraph.cpp',
-    '../compiler/translator/depgraph/DependencyGraphBuilder.cpp',
-    '../compiler/translator/depgraph/DependencyGraphOutput.cpp',
-    '../compiler/translator/depgraph/DependencyGraphTraverse.cpp',
-    '../compiler/translator/DetectCallDepth.cpp',
-    '../compiler/translator/DetectDiscontinuity.cpp',
-    '../compiler/translator/Diagnostics.cpp',
-    '../compiler/translator/DirectiveHandler.cpp',
-    '../compiler/translator/FlagStd140Structs.cpp',
-    '../compiler/translator/ForLoopUnroll.cpp',
-    '../compiler/translator/InfoSink.cpp',
-    '../compiler/translator/Initialize.cpp',
-    '../compiler/translator/InitializeDll.cpp',
-    '../compiler/translator/InitializeParseContext.cpp',
-    '../compiler/translator/InitializeVariables.cpp',
-    '../compiler/translator/Intermediate.cpp',
-    '../compiler/translator/intermOut.cpp',
-    '../compiler/translator/IntermTraverse.cpp',
-    '../compiler/translator/LoopInfo.cpp',
-    '../compiler/translator/ossource_win.cpp',
-    '../compiler/translator/OutputESSL.cpp',
-    '../compiler/translator/OutputGLSL.cpp',
-    '../compiler/translator/OutputGLSLBase.cpp',
-    '../compiler/translator/OutputHLSL.cpp',
-    '../compiler/translator/parseConst.cpp',
-    '../compiler/translator/ParseContext.cpp',
-    '../compiler/translator/PoolAlloc.cpp',
-    '../compiler/translator/QualifierAlive.cpp',
-    '../compiler/translator/RemoveTree.cpp',
-    '../compiler/translator/RewriteElseBlocks.cpp',
-    '../compiler/translator/SearchSymbol.cpp',
-    '../compiler/translator/ShaderLang.cpp',
-    '../compiler/translator/SymbolTable.cpp',
-    '../compiler/translator/timing/RestrictFragmentShaderTiming.cpp',
-    '../compiler/translator/timing/RestrictVertexShaderTiming.cpp',
-    '../compiler/translator/TranslatorESSL.cpp',
-    '../compiler/translator/TranslatorGLSL.cpp',
-    '../compiler/translator/TranslatorHLSL.cpp',
-    '../compiler/translator/Types.cpp',
-    '../compiler/translator/UnfoldShortCircuit.cpp',
-    '../compiler/translator/UnfoldShortCircuitAST.cpp',
-    '../compiler/translator/util.cpp',
-    '../compiler/translator/ValidateLimitations.cpp',
-    '../compiler/translator/ValidateOutputs.cpp',
-    '../compiler/translator/VariableInfo.cpp',
-    '../compiler/translator/VariablePacker.cpp',
-    '../compiler/translator/VersionGLSL.cpp',
-    '../third_party/compiler/ArrayBoundsClamper.cpp',
-    '../third_party/murmurhash/MurmurHash3.cpp',
-    '../third_party/systeminfo/SystemInfo.cpp',
-    'angletypes.cpp',
-    'Buffer.cpp',
-    'Context.cpp',
-    'DynamicHLSL.cpp',
-    'Fence.cpp',
-    'Float16ToFloat32.cpp',
-    'formatutils.cpp',
-    'Framebuffer.cpp',
-    'HandleAllocator.cpp',
-    'libGLESv2.cpp',
-    'main.cpp',
-    'precompiled.cpp',
-    'Program.cpp',
-    'ProgramBinary.cpp',
-    'Query.cpp',
-    'queryconversions.cpp',
-    'Renderbuffer.cpp',
-    'RenderbufferProxySet.cpp',
-    'renderer/BufferStorage.cpp',
-    'renderer/copyimage.cpp',
-    'renderer/d3d/HLSLCompiler.cpp',
-    'renderer/d3d11/Blit11.cpp',
-    'renderer/d3d11/BufferStorage11.cpp',
-    'renderer/d3d11/Clear11.cpp',
-    'renderer/d3d11/Fence11.cpp',
-    'renderer/d3d11/formatutils11.cpp',
-    'renderer/d3d11/Image11.cpp',
-    'renderer/d3d11/IndexBuffer11.cpp',
-    'renderer/d3d11/InputLayoutCache.cpp',
-    'renderer/d3d11/PixelTransfer11.cpp',
-    'renderer/d3d11/Query11.cpp',
-    'renderer/d3d11/Renderer11.cpp',
-    'renderer/d3d11/renderer11_utils.cpp',
-    'renderer/d3d11/RenderStateCache.cpp',
-    'renderer/d3d11/RenderTarget11.cpp',
-    'renderer/d3d11/ShaderExecutable11.cpp',
-    'renderer/d3d11/SwapChain11.cpp',
-    'renderer/d3d11/TextureStorage11.cpp',
-    'renderer/d3d11/VertexBuffer11.cpp',
-    'renderer/d3d9/Blit9.cpp',
-    'renderer/d3d9/BufferStorage9.cpp',
-    'renderer/d3d9/Fence9.cpp',
-    'renderer/d3d9/formatutils9.cpp',
-    'renderer/d3d9/Image9.cpp',
-    'renderer/d3d9/IndexBuffer9.cpp',
-    'renderer/d3d9/Query9.cpp',
-    'renderer/d3d9/Renderer9.cpp',
-    'renderer/d3d9/renderer9_utils.cpp',
-    'renderer/d3d9/RenderTarget9.cpp',
-    'renderer/d3d9/ShaderExecutable9.cpp',
-    'renderer/d3d9/SwapChain9.cpp',
-    'renderer/d3d9/TextureStorage9.cpp',
-    'renderer/d3d9/VertexBuffer9.cpp',
-    'renderer/d3d9/VertexDeclarationCache.cpp',
-    'renderer/Image.cpp',
-    'renderer/IndexBuffer.cpp',
-    'renderer/IndexDataManager.cpp',
-    'renderer/IndexRangeCache.cpp',
-    'renderer/loadimage.cpp',
-    'renderer/Renderer.cpp',
-    'renderer/TextureStorage.cpp',
-    'renderer/VertexBuffer.cpp',
-    'renderer/VertexDataManager.cpp',
-    'ResourceManager.cpp',
-    'Sampler.cpp',
-    'Shader.cpp',
-    'Texture.cpp',
-    'TransformFeedback.cpp',
-    'Uniform.cpp',
-    'validationES.cpp',
-    'validationES2.cpp',
-    'validationES3.cpp',
-    'VertexArray.cpp',
-]
-SOURCES += [
-    '../compiler/translator/glslang_lex.cpp',
-    '../compiler/translator/glslang_tab.cpp',
-    'renderer/loadimageSSE2.cpp',
-]
-SOURCES['renderer/loadimageSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-
-
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += [
-        '-Wno-attributes',
-        '-Wno-sign-compare',
-        '-Wno-unknown-pragmas',
-    ]
-    if CONFIG['CLANG_CXX']:
-        CXXFLAGS += ['-Wno-unused-private-field']
-
-DEFINES['NOMINMAX'] = True
-DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
-DEFINES['_HAS_EXCEPTIONS'] = 0
-
-if not CONFIG['MOZ_DEBUG']:
-    DEFINES['_SECURE_SCL'] = 0
-
-DEFINES['ANGLE_ENABLE_D3D9'] = True
-DEFINES['ANGLE_ENABLE_D3D11'] = True
-DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
-DEFINES['ANGLE_NO_EXCEPTIONS'] = True
-
-# We need these defined to nothing so that we don't get bogus dllimport declspecs
-DEFINES['GL_APICALL'] = ""
-DEFINES['GL_GLEXT_PROTOTYPES'] = ""
-DEFINES['EGLAPI'] = ""
-
-# ANGLE uses the STL, so we can't use our derpy STL wrappers.
-DISABLE_STL_WRAPPING = True
-
-
-LOCAL_INCLUDES += [ '../../include', '../../src' ]
-EXTRA_DSO_LDOPTS += [ 'd3d9.lib', 'dxguid.lib' ]
-
-LIBRARY_NAME = 'libGLESv2'
-FORCE_SHARED_LIB = True
-
-RCFILE = SRCDIR + '/libGLESv2.rc'
-DEFFILE = SRCDIR + '/libGLESv2.def'
-
-DEFINES['ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'] = '{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }'
-
+
+# Please note this file is autogenerated from generate_mozbuild.py, so do not modify it directly
+
+UNIFIED_SOURCES += [
+    '../common/blocklayout.cpp',
+    '../common/debug.cpp',
+    '../common/event_tracer.cpp',
+    '../common/mathutil.cpp',
+    '../common/RefCountObject.cpp',
+    '../common/utilities.cpp',
+    '../compiler/preprocessor/DiagnosticsBase.cpp',
+    '../compiler/preprocessor/DirectiveHandlerBase.cpp',
+    '../compiler/preprocessor/DirectiveParser.cpp',
+    '../compiler/preprocessor/ExpressionParser.cpp',
+    '../compiler/preprocessor/Input.cpp',
+    '../compiler/preprocessor/Lexer.cpp',
+    '../compiler/preprocessor/Macro.cpp',
+    '../compiler/preprocessor/MacroExpander.cpp',
+    '../compiler/preprocessor/Preprocessor.cpp',
+    '../compiler/preprocessor/Token.cpp',
+    '../compiler/preprocessor/Tokenizer.cpp',
+    '../compiler/translator/BuiltInFunctionEmulator.cpp',
+    '../compiler/translator/CodeGen.cpp',
+    '../compiler/translator/Compiler.cpp',
+    '../compiler/translator/compilerdebug.cpp',
+    '../compiler/translator/depgraph/DependencyGraph.cpp',
+    '../compiler/translator/depgraph/DependencyGraphBuilder.cpp',
+    '../compiler/translator/depgraph/DependencyGraphOutput.cpp',
+    '../compiler/translator/depgraph/DependencyGraphTraverse.cpp',
+    '../compiler/translator/DetectCallDepth.cpp',
+    '../compiler/translator/DetectDiscontinuity.cpp',
+    '../compiler/translator/Diagnostics.cpp',
+    '../compiler/translator/DirectiveHandler.cpp',
+    '../compiler/translator/FlagStd140Structs.cpp',
+    '../compiler/translator/ForLoopUnroll.cpp',
+    '../compiler/translator/InfoSink.cpp',
+    '../compiler/translator/Initialize.cpp',
+    '../compiler/translator/InitializeDll.cpp',
+    '../compiler/translator/InitializeParseContext.cpp',
+    '../compiler/translator/InitializeVariables.cpp',
+    '../compiler/translator/Intermediate.cpp',
+    '../compiler/translator/intermOut.cpp',
+    '../compiler/translator/IntermTraverse.cpp',
+    '../compiler/translator/LoopInfo.cpp',
+    '../compiler/translator/ossource_win.cpp',
+    '../compiler/translator/OutputESSL.cpp',
+    '../compiler/translator/OutputGLSL.cpp',
+    '../compiler/translator/OutputGLSLBase.cpp',
+    '../compiler/translator/OutputHLSL.cpp',
+    '../compiler/translator/parseConst.cpp',
+    '../compiler/translator/ParseContext.cpp',
+    '../compiler/translator/PoolAlloc.cpp',
+    '../compiler/translator/QualifierAlive.cpp',
+    '../compiler/translator/RemoveTree.cpp',
+    '../compiler/translator/RewriteElseBlocks.cpp',
+    '../compiler/translator/SearchSymbol.cpp',
+    '../compiler/translator/ShaderLang.cpp',
+    '../compiler/translator/SymbolTable.cpp',
+    '../compiler/translator/timing/RestrictFragmentShaderTiming.cpp',
+    '../compiler/translator/timing/RestrictVertexShaderTiming.cpp',
+    '../compiler/translator/TranslatorESSL.cpp',
+    '../compiler/translator/TranslatorGLSL.cpp',
+    '../compiler/translator/TranslatorHLSL.cpp',
+    '../compiler/translator/Types.cpp',
+    '../compiler/translator/UnfoldShortCircuit.cpp',
+    '../compiler/translator/UnfoldShortCircuitAST.cpp',
+    '../compiler/translator/util.cpp',
+    '../compiler/translator/ValidateLimitations.cpp',
+    '../compiler/translator/ValidateOutputs.cpp',
+    '../compiler/translator/VariableInfo.cpp',
+    '../compiler/translator/VariablePacker.cpp',
+    '../compiler/translator/VersionGLSL.cpp',
+    '../third_party/compiler/ArrayBoundsClamper.cpp',
+    '../third_party/murmurhash/MurmurHash3.cpp',
+    '../third_party/systeminfo/SystemInfo.cpp',
+    'angletypes.cpp',
+    'Buffer.cpp',
+    'Context.cpp',
+    'DynamicHLSL.cpp',
+    'Fence.cpp',
+    'Float16ToFloat32.cpp',
+    'formatutils.cpp',
+    'Framebuffer.cpp',
+    'HandleAllocator.cpp',
+    'libGLESv2.cpp',
+    'main.cpp',
+    'precompiled.cpp',
+    'Program.cpp',
+    'ProgramBinary.cpp',
+    'Query.cpp',
+    'queryconversions.cpp',
+    'Renderbuffer.cpp',
+    'RenderbufferProxySet.cpp',
+    'renderer/BufferStorage.cpp',
+    'renderer/copyimage.cpp',
+    'renderer/d3d/HLSLCompiler.cpp',
+    'renderer/d3d9/Blit9.cpp',
+    'renderer/d3d9/BufferStorage9.cpp',
+    'renderer/d3d9/Fence9.cpp',
+    'renderer/d3d9/formatutils9.cpp',
+    'renderer/d3d9/Image9.cpp',
+    'renderer/d3d9/IndexBuffer9.cpp',
+    'renderer/d3d9/Query9.cpp',
+    'renderer/d3d9/Renderer9.cpp',
+    'renderer/d3d9/renderer9_utils.cpp',
+    'renderer/d3d9/RenderTarget9.cpp',
+    'renderer/d3d9/ShaderExecutable9.cpp',
+    'renderer/d3d9/SwapChain9.cpp',
+    'renderer/d3d9/TextureStorage9.cpp',
+    'renderer/d3d9/VertexBuffer9.cpp',
+    'renderer/d3d9/VertexDeclarationCache.cpp',
+    'renderer/Image.cpp',
+    'renderer/IndexBuffer.cpp',
+    'renderer/IndexDataManager.cpp',
+    'renderer/IndexRangeCache.cpp',
+    'renderer/loadimage.cpp',
+    'renderer/Renderer.cpp',
+    'renderer/TextureStorage.cpp',
+    'renderer/VertexBuffer.cpp',
+    'renderer/VertexDataManager.cpp',
+    'ResourceManager.cpp',
+    'Sampler.cpp',
+    'Shader.cpp',
+    'Texture.cpp',
+    'TransformFeedback.cpp',
+    'Uniform.cpp',
+    'validationES.cpp',
+    'validationES2.cpp',
+    'validationES3.cpp',
+    'VertexArray.cpp',
+]
+SOURCES += [
+    '../compiler/translator/glslang_lex.cpp',
+    '../compiler/translator/glslang_tab.cpp',
+    'renderer/loadimageSSE2.cpp',
+]
+SOURCES['renderer/loadimageSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    UNIFIED_SOURCES += [
+        'renderer/d3d11/Blit11.cpp',
+        'renderer/d3d11/BufferStorage11.cpp',
+        'renderer/d3d11/Clear11.cpp',
+        'renderer/d3d11/Fence11.cpp',
+        'renderer/d3d11/formatutils11.cpp',
+        'renderer/d3d11/Image11.cpp',
+        'renderer/d3d11/IndexBuffer11.cpp',
+        'renderer/d3d11/InputLayoutCache.cpp',
+        'renderer/d3d11/PixelTransfer11.cpp',
+        'renderer/d3d11/Query11.cpp',
+        'renderer/d3d11/Renderer11.cpp',
+        'renderer/d3d11/renderer11_utils.cpp',
+        'renderer/d3d11/RenderStateCache.cpp',
+        'renderer/d3d11/RenderTarget11.cpp',
+        'renderer/d3d11/ShaderExecutable11.cpp',
+        'renderer/d3d11/SwapChain11.cpp',
+        'renderer/d3d11/TextureStorage11.cpp',
+        'renderer/d3d11/VertexBuffer11.cpp',
+    ]
+
+
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += [
+        '-Wno-attributes',
+        '-Wno-sign-compare',
+        '-Wno-unknown-pragmas',
+    ]
+    if CONFIG['CLANG_CXX']:
+        CXXFLAGS += ['-Wno-unused-private-field']
+
+if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']]
+
+DEFINES['NOMINMAX'] = True
+DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
+DEFINES['_HAS_EXCEPTIONS'] = 0
+
+if not CONFIG['MOZ_DEBUG']:
+    DEFINES['_SECURE_SCL'] = 0
+
+DEFINES['ANGLE_ENABLE_D3D9'] = True
+if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    DEFINES['ANGLE_ENABLE_D3D11'] = True
+
+DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
+DEFINES['ANGLE_NO_EXCEPTIONS'] = True
+
+# We need these defined to nothing so that we don't get bogus dllimport declspecs
+DEFINES['GL_APICALL'] = ""
+DEFINES['GL_GLEXT_PROTOTYPES'] = ""
+DEFINES['EGLAPI'] = ""
+
+# ANGLE uses the STL, so we can't use our derpy STL wrappers.
+DISABLE_STL_WRAPPING = True
+
+
+LOCAL_INCLUDES += [ '../../include', '../../src' ]
+
+
+if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+  EXTRA_DSO_LDOPTS += [ 'd3d9.lib', 'dxguid.lib' ]
+else:
+  EXTRA_DSO_LDOPTS += [
+    '\'%s/lib/%s/d3d9.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']),
+    '\'%s/lib/%s/dxguid.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']),
+  ]
+
+LIBRARY_NAME = 'libGLESv2'
+FORCE_SHARED_LIB = True
+
+RCFILE = SRCDIR + '/libGLESv2.rc'
+DEFFILE = SRCDIR + '/libGLESv2.def'
+
+DEFINES['ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'] = '{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }'
+