Skip to content

Commit

Permalink
Reverted the way dependencies were pulled in so that we can still pro…
Browse files Browse the repository at this point in the history
…perly support windows
  • Loading branch information
flippmoke committed Apr 4, 2017
1 parent 47f2fc2 commit f144d24
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "deps/wagyu"]
path = deps/wagyu
url = https://github.com/mapbox/wagyu.git
[submodule "deps/geometry"]
path = deps/geometry
url = https://github.com/mapbox/geometry.hpp.git
3 changes: 3 additions & 0 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
"<!(node -e \"require('nan')\")",
# TODO: move these to mason packages once we have a minimal windows client for mason (@springmeyer)
# https://github.com/mapbox/mason/issues/396
"./deps/geometry/include/",
"./deps/wagyu/include/",
"<!(node -e \"require('protozero')\")",
"<!(node -e \"require('mapnik-vector-tile')\")"
],
'defines': [
Expand Down
1 change: 1 addition & 0 deletions deps/geometry
Submodule geometry added at b0d64e
1 change: 1 addition & 0 deletions deps/wagyu
Submodule wagyu added at 82ee12
5 changes: 0 additions & 5 deletions install_mason.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,4 @@ if [ ! -f ./mason_packages/.link/bin/mapnik-config ]; then
# In the future we could pull from that version automatically if mason were to support knowing the right dep
# versions to install automatically. Until then there is not much point since the deps are still hardcoded here.
install mapnik 3.0.13-1

# node-mapnik deps
install protozero 1.5.1
install wagyu 0.4.2
install geometry 0.9.1
fi
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"license": "BSD-3-Clause",
"dependencies": {
"mapnik-vector-tile": "1.3.0",
"protozero": "1.5.1",
"nan": "~2.5.0",
"node-pre-gyp": "~0.6.30"
},
Expand Down

0 comments on commit f144d24

Please sign in to comment.