Skip to content

A
angle
Commit 679280b2 by apatrick@chromium.org
Options

Fix gyp build and disable warning that is an error in Chrome.

Review URL: https://codereview.appspot.com/6260063 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1127 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent c745adb0
Showing with 4 additions and 2 deletions
src/build_angle.gyp
...@@ -161,8 +161,6 @@ ...@@ -161,8 +161,6 @@
], ],
'sources': [ 'sources': [
'compiler/CodeGenGLSL.cpp', 'compiler/CodeGenGLSL.cpp',
'compiler/DetectDiscontinuity.cpp',
'compiler/DetectDiscontinuity.h',
'compiler/OutputESSL.cpp', 'compiler/OutputESSL.cpp',
'compiler/OutputESSL.h', 'compiler/OutputESSL.h',
'compiler/OutputGLSLBase.cpp', 'compiler/OutputGLSLBase.cpp',
...@@ -195,6 +193,8 @@ ...@@ -195,6 +193,8 @@
], ],
'sources': [ 'sources': [
'compiler/ShaderLang.cpp', 'compiler/ShaderLang.cpp',
'compiler/DetectDiscontinuity.cpp',
'compiler/DetectDiscontinuity.h',
'compiler/CodeGenHLSL.cpp', 'compiler/CodeGenHLSL.cpp',
'compiler/OutputHLSL.cpp', 'compiler/OutputHLSL.cpp',
'compiler/OutputHLSL.h', 'compiler/OutputHLSL.h',
......
src/compiler/depgraph/DependencyGraph.cpp
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#pragma warning(disable: 4718)
#include "compiler/depgraph/DependencyGraph.h" #include "compiler/depgraph/DependencyGraph.h"
#include "compiler/depgraph/DependencyGraphBuilder.h" #include "compiler/depgraph/DependencyGraphBuilder.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment