diff options
| -rwxr-xr-x | bin/build-shaders.js | 2 | ||||
| -rw-r--r-- | llmr.gyp | 30 |
2 files changed, 5 insertions, 27 deletions
diff --git a/bin/build-shaders.js b/bin/build-shaders.js index b5072c3707..fd896af24b 100755 --- a/bin/build-shaders.js +++ b/bin/build-shaders.js @@ -3,7 +3,7 @@ var fs = require('fs'); var path = require('path'); -var mkdirp = require('./mkdirp'); +var mkdirp = require('mkdirp'); try { var glsl = require('glsl-optimizer'); } catch(err) {} @@ -41,12 +41,12 @@ { 'action_name': 'Build Stylesheet', 'inputs': [ - 'bin/style.js', + 'bin/style.json', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js' ], - 'action': ['<@(node)', 'bin/build-style.js', '<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)'] + 'action': ['<@(node)', 'bin/build-style.js', '<@(_inputs)', '<@(_outputs)'] } ], 'direct_dependent_settings': { @@ -56,28 +56,6 @@ } }, { - 'target_name': 'fuzz_stylesheet', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'Fuzz Stylesheet', - 'inputs': [ - 'bin/style.js', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/style-fuzzed.min.js' - ], - 'action': ['<@(node)', 'bin/fuzz-style.js', '<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)'] - } - ], - 'direct_dependent_settings': { - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/style-fuzzed.min.js' - ], - } - }, - { 'target_name': 'copy_default_stylesheet', 'type': 'none', 'hard_dependency': 1, @@ -118,7 +96,7 @@ '<!@(find include -name "*.hpp")', '<!@(find include -name "*.h")', '<!@(find src -name "*.glsl")', - 'bin/style.js' + 'bin/style.json' ], 'xcode_settings': { 'SDKROOT': 'macosx', @@ -185,7 +163,7 @@ '<!@(find include -name "*.hpp")', '<!@(find include -name "*.h")', '<!@(find src -name "*.glsl")', - 'bin/style.js' + 'bin/style.json' ], 'xcode_settings': { 'SDKROOT': 'iphoneos', |