summaryrefslogtreecommitdiff
path: root/llmr.gyp
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-07-09 13:03:56 -0700
committerMike Morris <michael.patrick.morris@gmail.com>2014-07-09 13:03:56 -0700
commit172466301b20c299b2b7fd81078cb22153f11e37 (patch)
tree183540ec913dda1218d304dc43b527fae66a92ca /llmr.gyp
parent37f8b7cdb0350dd851e46e3a230fa0b24fc8125c (diff)
downloadqtlocation-mapboxgl-172466301b20c299b2b7fd81078cb22153f11e37.tar.gz
fix gypfile
Diffstat (limited to 'llmr.gyp')
-rw-r--r--llmr.gyp30
1 files changed, 4 insertions, 26 deletions
diff --git a/llmr.gyp b/llmr.gyp
index 0983d23ce2..8a656945ef 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -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',