Skip to content

A
angle
Commit 84a96288 by alokp@chromium.org
Options

Moved windows-only targets into OS==win conditional.

Review URL: http://codereview.appspot.com/1473043 git-svn-id: https://angleproject.googlecode.com/svn/trunk@325 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent dd7948b3
Showing with 14 additions and 0 deletions
samples/build_samples.gyp
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
'translator/translator.cpp', 'translator/translator.cpp',
], ],
}, },
],
'conditions': [
['OS=="win"', {
'targets': [
{ {
'target_name': 'es_util', 'target_name': 'es_util',
'type': 'static_library', 'type': 'static_library',
...@@ -148,6 +152,8 @@ ...@@ -148,6 +152,8 @@
], ],
}, },
], ],
}],
],
} }
# Local Variables: # Local Variables:
......
src/build_angle.gyp
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
'--outfile=<(glslang_cpp_file)', '--outfile=<(glslang_cpp_file)',
'<(_inputs)', '<(_inputs)',
], ],
'message': 'Executing flex on <(_inputs)',
}, },
{ {
'action_name': 'bison_glslang', 'action_name': 'bison_glslang',
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
'--output=<(glslang_tab_cpp_file)', '--output=<(glslang_tab_cpp_file)',
'<(_inputs)', '<(_inputs)',
], ],
'message': 'Executing bison on <(_inputs)',
}, },
], ],
}, },
...@@ -144,6 +146,10 @@ ...@@ -144,6 +146,10 @@
'compiler/UnfoldSelect.h', 'compiler/UnfoldSelect.h',
], ],
}, },
],
'conditions': [
['OS=="win"', {
'targets': [
{ {
'target_name': 'libGLESv2', 'target_name': 'libGLESv2',
'type': 'shared_library', 'type': 'shared_library',
...@@ -227,6 +233,8 @@ ...@@ -227,6 +233,8 @@
}, },
}, },
], ],
}],
],
} }
# Local Variables: # Local Variables:
......
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