summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--gyp/platform-node.gypi (renamed from platform/node/binding.gyp)26
-rw-r--r--mbgl.gyp1
3 files changed, 17 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 358b3c05c5..ab27176d50 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,10 @@ android-all: android-lib-x86 android-lib-x86-64
android-all: android-lib-mips android-lib-mips-64
cd android/java && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
+.PHONY: node
+# Builds the Node library
+node: ; $(RUN) HTTP=none ASSET=none CACHE=none Makefile/node
+
.PHONY: test
test: ; $(RUN) Makefile/test
test-%: ; $(RUN) test-$*
diff --git a/platform/node/binding.gyp b/gyp/platform-node.gypi
index a5fb583399..9019135e25 100644
--- a/platform/node/binding.gyp
+++ b/gyp/platform-node.gypi
@@ -1,25 +1,23 @@
{
'targets': [
- { 'target_name': '<(module_name)',
+ { 'target_name': 'platform-node',
'dependencies': [
- './<(mbgl)/mbgl.gyp:core',
- './<(mbgl)/mbgl.gyp:platform-<(platform_lib)',
- './<(mbgl)/mbgl.gyp:headless-<(headless_lib)',
+ 'version',
],
'include_dirs': [ "<!(node -e \"require('nan')\")" ],
'sources': [
- 'src/node_mapbox_gl_native.cpp',
- 'src/node_log.hpp',
- 'src/node_log.cpp',
- 'src/node_file_source.hpp',
- 'src/node_file_source.cpp',
- 'src/node_map.hpp',
- 'src/node_map.cpp',
- 'src/node_request.hpp',
- 'src/node_request.cpp',
- 'src/util/async_queue.hpp',
+ '../platform/node/src/node_mapbox_gl_native.cpp',
+ '../platform/node/src/node_log.hpp',
+ '../platform/node/src/node_log.cpp',
+ '../platform/node/src/node_file_source.hpp',
+ '../platform/node/src/node_file_source.cpp',
+ '../platform/node/src/node_map.hpp',
+ '../platform/node/src/node_map.cpp',
+ '../platform/node/src/node_request.hpp',
+ '../platform/node/src/node_request.cpp',
+ '../platform/node/src/util/async_queue.hpp',
],
'conditions': [
diff --git a/mbgl.gyp b/mbgl.gyp
index 959a9729d6..7c221655eb 100644
--- a/mbgl.gyp
+++ b/mbgl.gyp
@@ -15,6 +15,7 @@
['platform_lib == "osx" and host == "osx"', { 'includes': [ './gyp/platform-osx.gypi' ] } ],
['platform_lib == "ios" and host == "ios"', { 'includes': [ './gyp/platform-ios.gypi' ] } ],
['platform_lib == "linux"', { 'includes': [ './gyp/platform-linux.gypi' ] } ],
+ ['platform_lib == "node"', { 'includes': [ './gyp/platform-node.gypi' ] } ],
['platform_lib == "android" and host == "android"', { 'includes': [ './gyp/platform-android.gypi' ] } ],
['http_lib == "curl"', { 'includes': [ './gyp/http-curl.gypi' ] } ],
['http_lib == "nsurl" and (host == "osx" or host == "ios")', { 'includes': [ './gyp/http-nsurl.gypi' ] } ],