diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-03-26 11:51:05 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-03-26 11:51:05 +0100 |
| commit | 249b42a29dd6c93eaadd321ae1f6d95cd7b4382e (patch) | |
| tree | cb8fc3475f111a3c77dc9cd688e9dc4ebde2680a | |
| parent | c76ce8e6aa60a862ecee1ed626ac1fea4f1a4c04 (diff) | |
| download | qtlocation-mapboxgl-249b42a29dd6c93eaadd321ae1f6d95cd7b4382e.tar.gz | |
move node modules to bin/ folder to fix build
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -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 @@ -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 |