summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile6
-rw-r--r--bin/package.json (renamed from package.json)0
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 2f1e1b2b87..bc11cf95a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
/config.gypi
/config.mk
/build
-/node_modules
+/bin/node_modules
/include/llmr/shader/shaders.hpp
/include/llmr/style/resources.hpp
/src/shader/shaders.cpp
diff --git a/Makefile b/Makefile
index 3038bbc94b..5e492a2a2d 100644
--- a/Makefile
+++ b/Makefile
@@ -71,10 +71,10 @@ test: deps config.gypi src test/test.gyp
$${FILE}; \
done
-glsl-optimizer: node_modules/glsl-optimizer/build/Release/glslOptimizer.node
+glsl-optimizer: bin/node_modules/glsl-optimizer/build/Release/glslOptimizer.node
-node_modules/glsl-optimizer/build/Release/glslOptimizer.node:
- npm install
+bin/node_modules/glsl-optimizer/build/Release/glslOptimizer.node:
+ cd bin && npm install
clean:
-rm -rf out
diff --git a/package.json b/bin/package.json
index 4431471e99..4431471e99 100644
--- a/package.json
+++ b/bin/package.json