diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-11-05 16:19:21 -0500 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-11-05 18:16:33 -0500 |
| commit | 36a8fb32d5e4fd58d5ea04f45a4cabdbab9ed920 (patch) | |
| tree | d110e3abf7cf4b32b59011a6b86081c1b3d9fe5b | |
| parent | 9066552c136358cdf2da8347f602b5fee4c69d2d (diff) | |
| download | qtlocation-mapboxgl-36a8fb32d5e4fd58d5ea04f45a4cabdbab9ed920.tar.gz | |
[node] Fixes 'make xnode' to configure HOST_SLUG.gypi
Adds node-gyp to dev-dependencies to support 'make xnode' on Node v0.10.x
Ignores -Wnested-anon-types around v8.h includes.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | platform/node/src/node_file_source.hpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_log.hpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_map.hpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_mapbox_gl_native.cpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_request.hpp | 1 |
7 files changed, 7 insertions, 1 deletions
@@ -86,7 +86,7 @@ node: ; $(RUN) HTTP=none ASSET=none CACHE=none Makefile/node .PHONY: Xcode/node -Xcode/node: ; $(RUN) HTTP=none ASSET=none CACHE=none node/xproj +Xcode/node: ; $(RUN) HTTP=none ASSET=none CACHE=none Xcode/node .PHONY: xnode xnode: Xcode/node ; @open ./build/binding.xcodeproj diff --git a/package.json b/package.json index 97875af2ef..c1e590c323 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "devDependencies": { "aws-sdk": "^2.2.9", "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#744b63be01e36c75c6e629aec16a53048c0b7dbc", + "node-gyp": "^3.0.3", "read-package-json": "^2.0.2", "request": "^2.65.0", "tape": "^4.2.1" diff --git a/platform/node/src/node_file_source.hpp b/platform/node/src/node_file_source.hpp index 038765cb20..0ebdb541c9 100644 --- a/platform/node/src/node_file_source.hpp +++ b/platform/node/src/node_file_source.hpp @@ -5,6 +5,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <nan.h> #pragma GCC diagnostic pop diff --git a/platform/node/src/node_log.hpp b/platform/node/src/node_log.hpp index d29e4e28e0..8798016d7a 100644 --- a/platform/node/src/node_log.hpp +++ b/platform/node/src/node_log.hpp @@ -5,6 +5,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <nan.h> #pragma GCC diagnostic pop diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp index d3b69e7c28..91cada17d1 100644 --- a/platform/node/src/node_map.hpp +++ b/platform/node/src/node_map.hpp @@ -8,6 +8,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <nan.h> #pragma GCC diagnostic pop diff --git a/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp index c0fb47d144..5bf03594e5 100644 --- a/platform/node/src/node_mapbox_gl_native.cpp +++ b/platform/node/src/node_mapbox_gl_native.cpp @@ -1,6 +1,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <node.h> #include <nan.h> #pragma GCC diagnostic pop diff --git a/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp index 35bb8e5205..8e01c544eb 100644 --- a/platform/node/src/node_request.hpp +++ b/platform/node/src/node_request.hpp @@ -3,6 +3,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <nan.h> #pragma GCC diagnostic pop |