Merge pull request #443 from twpayne/only-use-glsl-unit-if-available

Only use glsl-unit if it is available
This commit is contained in:
Tom Payne
2013-03-27 10:05:23 -07:00
+11 -10
View File
@@ -180,16 +180,17 @@ def build_src_external_src_types_js(t):
'--typedef', 'src/objectliterals.exports') '--typedef', 'src/objectliterals.exports')
for glsl_src in GLSL_SRC: if os.path.exists(TEMPLATE_GLSL_COMPILER_JS):
def shader_src_helper(glsl_src): for glsl_src in GLSL_SRC:
@target(glsl_src.replace('.glsl', 'shader.js'), glsl_src, def shader_src_helper(glsl_src):
'src/ol/webgl/shader.mustache') @target(glsl_src.replace('.glsl', 'shader.js'), glsl_src,
def shader_src(t): 'src/ol/webgl/shader.mustache')
t.run('%(NODE)s', TEMPLATE_GLSL_COMPILER_JS, def shader_src(t):
'--input', glsl_src, t.run('%(NODE)s', TEMPLATE_GLSL_COMPILER_JS,
'--template', 'src/ol/webgl/shader.mustache', '--input', glsl_src,
'--output', t.name) '--template', 'src/ol/webgl/shader.mustache',
shader_src_helper(glsl_src) '--output', t.name)
shader_src_helper(glsl_src)
def _build_require_list(dependencies, output_file_name): def _build_require_list(dependencies, output_file_name):