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

Fix gyp build and disable warning that is an error in Chrome.
679280b2 · apatrick@chromium.org · c745adb0 · 679280b2 · 679280b2
Commit 679280b2 authored May 31, 2012 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

build_angle.gyp src/build_angle.gyp +2 -2

DependencyGraph.cpp src/compiler/depgraph/DependencyGraph.cpp +2 -0

No files found.
--- a/src/build_angle.gyp
+++ b/src/build_angle.gyp
@@ -161,8 +161,6 @@
      ],
      'sources': [
        'compiler/CodeGenGLSL.cpp',
-        'compiler/DetectDiscontinuity.cpp',
-        'compiler/DetectDiscontinuity.h',
        'compiler/OutputESSL.cpp',
        'compiler/OutputESSL.h',        
        'compiler/OutputGLSLBase.cpp',
@@ -195,6 +193,8 @@
          ],
          'sources': [
            'compiler/ShaderLang.cpp',
+            'compiler/DetectDiscontinuity.cpp',
+            'compiler/DetectDiscontinuity.h',
            'compiler/CodeGenHLSL.cpp',
            'compiler/OutputHLSL.cpp',
            'compiler/OutputHLSL.h',

--- a/src/compiler/depgraph/DependencyGraph.cpp
+++ b/src/compiler/depgraph/DependencyGraph.cpp
@@ -4,6 +4,8 @@
 // found in the LICENSE file.
 //

+#pragma warning(disable: 4718)
+
 #include "compiler/depgraph/DependencyGraph.h"
 #include "compiler/depgraph/DependencyGraphBuilder.h"