diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 16:33:45 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 16:33:45 -0400 |
| commit | a50042349c002dcac2812c0ee046025b36ee45a4 (patch) | |
| tree | 6e996229aead47a6d9a8f1e2c702454cc2110f56 /gyp | |
| parent | 8dda6482fa429e01da087a690ca7d9cde3a7abc0 (diff) | |
| parent | ffc42cac0232cb4c30ed946717414174fd42de8b (diff) | |
| download | qtlocation-mapboxgl-a50042349c002dcac2812c0ee046025b36ee45a4.tar.gz | |
Merge branch 'master' into platform-image
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/npm_install.gypi | 20 | ||||
| -rw-r--r-- | gyp/shaders.gypi | 6 |
2 files changed, 2 insertions, 24 deletions
diff --git a/gyp/npm_install.gypi b/gyp/npm_install.gypi deleted file mode 100644 index ddd3081ad5..0000000000 --- a/gyp/npm_install.gypi +++ /dev/null @@ -1,20 +0,0 @@ -{ - 'targets': [ - { 'target_name': 'npm_install', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'npm install', - 'inputs': [ - '../bin/package.json', - ], - 'outputs': [ - '../bin/node_modules', - ], - 'action': ['./scripts/npm_install.sh', '<@(npm)'] - } - ], - }, - ] -} diff --git a/gyp/shaders.gypi b/gyp/shaders.gypi index 9435bd7d9c..edbcb61f23 100644 --- a/gyp/shaders.gypi +++ b/gyp/shaders.gypi @@ -4,13 +4,11 @@ 'target_name': 'shaders', 'type': 'none', 'hard_dependency': 1, - 'dependencies': [ - 'npm_install' - ], 'actions': [ { 'action_name': 'Build Shaders', 'inputs': [ + '../scripts/build-shaders.py', '<!@(find src -name "*.glsl")' ], 'outputs': [ @@ -18,7 +16,7 @@ '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp', '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp', ], - 'action': ['<@(node)', 'bin/build-shaders.js', '<(SHARED_INTERMEDIATE_DIR)'], + 'action': ['<@(python)', 'scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'], } ], 'direct_dependent_settings': { |