Commit fdea6946 by apatrick@chromium.org

Checked in change that should have been in r801.

Review URL: http://codereview.appspot.com/5318051 git-svn-id: https://angleproject.googlecode.com/svn/trunk@803 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent cf094c00
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
'.', '.',
'../include', '../include',
], ],
'defines': [
'COMPILER_IMPLEMENTATION',
],
'sources': [ 'sources': [
'compiler/BaseTypes.h', 'compiler/BaseTypes.h',
'compiler/BuiltInFunctionEmulator.cpp', 'compiler/BuiltInFunctionEmulator.cpp',
...@@ -60,7 +63,6 @@ ...@@ -60,7 +63,6 @@
'compiler/QualifierAlive.h', 'compiler/QualifierAlive.h',
'compiler/RemoveTree.cpp', 'compiler/RemoveTree.cpp',
'compiler/RemoveTree.h', 'compiler/RemoveTree.h',
'compiler/ShaderLang.cpp',
'compiler/ShHandle.h', 'compiler/ShHandle.h',
'compiler/SymbolTable.cpp', 'compiler/SymbolTable.cpp',
'compiler/SymbolTable.h', 'compiler/SymbolTable.h',
...@@ -99,12 +101,15 @@ ...@@ -99,12 +101,15 @@
}, },
{ {
'target_name': 'translator_glsl', 'target_name': 'translator_glsl',
'type': 'static_library', 'type': '<(component)',
'dependencies': ['translator_common'], 'dependencies': ['translator_common'],
'include_dirs': [ 'include_dirs': [
'.', '.',
'../include', '../include',
], ],
'defines': [
'COMPILER_IMPLEMENTATION',
],
'sources': [ 'sources': [
'compiler/CodeGenGLSL.cpp', 'compiler/CodeGenGLSL.cpp',
'compiler/OutputESSL.cpp', 'compiler/OutputESSL.cpp',
...@@ -113,6 +118,7 @@ ...@@ -113,6 +118,7 @@
'compiler/OutputGLSLBase.h', 'compiler/OutputGLSLBase.h',
'compiler/OutputGLSL.cpp', 'compiler/OutputGLSL.cpp',
'compiler/OutputGLSL.h', 'compiler/OutputGLSL.h',
'compiler/ShaderLang.cpp',
'compiler/TranslatorESSL.cpp', 'compiler/TranslatorESSL.cpp',
'compiler/TranslatorESSL.h', 'compiler/TranslatorESSL.h',
'compiler/TranslatorGLSL.cpp', 'compiler/TranslatorGLSL.cpp',
...@@ -123,13 +129,17 @@ ...@@ -123,13 +129,17 @@
}, },
{ {
'target_name': 'translator_hlsl', 'target_name': 'translator_hlsl',
'type': 'static_library', 'type': '<(component)',
'dependencies': ['translator_common'], 'dependencies': ['translator_common'],
'include_dirs': [ 'include_dirs': [
'.', '.',
'../include', '../include',
], ],
'defines': [
'COMPILER_IMPLEMENTATION',
],
'sources': [ 'sources': [
'compiler/ShaderLang.cpp',
'compiler/CodeGenHLSL.cpp', 'compiler/CodeGenHLSL.cpp',
'compiler/OutputHLSL.cpp', 'compiler/OutputHLSL.cpp',
'compiler/OutputHLSL.h', 'compiler/OutputHLSL.h',
......
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 802 #define BUILD_REVISION 803
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
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