summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
Diffstat (limited to 'gyp')
-rw-r--r--gyp/npm_install.gypi20
-rw-r--r--gyp/shaders.gypi6
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': {