Skip to content

A
angle
Commit 4e13a77e by zmo@google.com
Options

Make essl_to_glsl target windows only.

This is a quick fix for gclient runhooks error on Mac/Linux. BUG= TEST=gclient runhooks --force on Mac/Linux Review URL: https://codereview.appspot.com/5732047 git-svn-id: https://angleproject.googlecode.com/svn/trunk@997 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 35342dc4
Showing with 5 additions and 5 deletions
samples/build_samples.gyp
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
'translator/translator.cpp', 'translator/translator.cpp',
], ],
}, },
],
'conditions': [
['OS=="win"', {
'targets': [
{ {
'target_name': 'essl_to_hlsl', 'target_name': 'essl_to_hlsl',
'type': 'executable', 'type': 'executable',
...@@ -38,10 +42,6 @@ ...@@ -38,10 +42,6 @@
} }
} }
}, },
],
'conditions': [
['OS=="win"', {
'targets': [
{ {
'target_name': 'es_util', 'target_name': 'es_util',
'type': 'static_library', 'type': 'static_library',
......
src/common/version.h
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 996 #define BUILD_REVISION 997
#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