Revert "PLATFORM=node make node"

This reverts commit cef04fcfa7.
This commit is contained in:
Mike Morris
2015-08-24 17:12:02 -04:00
parent cef04fcfa7
commit 8a67805a3c
3 changed files with 14 additions and 17 deletions

View File

@@ -80,10 +80,6 @@ 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-$*

View File

@@ -15,7 +15,6 @@
['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' ] } ],

View File

@@ -1,23 +1,25 @@
{
'targets': [
{ 'target_name': 'platform-node',
{ 'target_name': '<(module_name)',
'dependencies': [
'version',
'./<(mbgl)/mbgl.gyp:core',
'./<(mbgl)/mbgl.gyp:platform-<(platform_lib)',
'./<(mbgl)/mbgl.gyp:headless-<(headless_lib)',
],
'include_dirs': [ "<!(node -e \"require('nan')\")" ],
'sources': [
'../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',
'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',
],
'conditions': [