summaryrefslogtreecommitdiff
path: root/scripts/main.mk
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-08-25 14:30:13 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-08-25 14:30:13 -0400
commit3fea9d38782f9c42a606206b1318f1e5508cf62a (patch)
treec66526421af02b42b819a2ff3d8ee8ec5da550c3 /scripts/main.mk
parent8a67805a3c146198d58650940cf91905b9061f02 (diff)
downloadqtlocation-mapboxgl-3fea9d38782f9c42a606206b1318f1e5508cf62a.tar.gz
'make node' compiles!
Diffstat (limited to 'scripts/main.mk')
-rw-r--r--scripts/main.mk18
1 files changed, 15 insertions, 3 deletions
diff --git a/scripts/main.mk b/scripts/main.mk
index d61a61e034..451f6a0d06 100644
--- a/scripts/main.mk
+++ b/scripts/main.mk
@@ -70,7 +70,6 @@ config/%.gypi: $(SUBMODULES) configure $(CONFIGURE_FILES)
#### Build files ###############################################################
GYP_FLAGS += -Dhost=$(HOST)
-GYP_FLAGS += -Iconfig/$(HOST_SLUG).gypi
GYP_FLAGS += -Dplatform_lib=$(PLATFORM)
GYP_FLAGS += -Dhttp_lib=$(HTTP)
GYP_FLAGS += -Dasset_lib=$(ASSET)
@@ -85,15 +84,28 @@ GYP_FLAGS += --generator-output=./build/$(HOST_SLUG)
.PHONY: Makefile/__project__
Makefile/__project__: print-env $(SUBMODULES) config/$(HOST_SLUG).gypi
@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n"
- $(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) -f make$(GYP_FLAVOR_SUFFIX)
+ $(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) \
+ -Iconfig/$(HOST_SLUG).gypi -f make$(GYP_FLAVOR_SUFFIX)
.PHONY: Xcode/__project__
Xcode/__project__: print-env $(SUBMODULES) config/$(HOST_SLUG).gypi
@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n"
- $(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) -f xcode$(GYP_FLAVOR_SUFFIX)
+ $(QUIET)$(ENV) deps/run_gyp gyp/$(HOST).gyp $(GYP_FLAGS) \
+ -Iconfig/$(HOST_SLUG).gypi -f xcode$(GYP_FLAVOR_SUFFIX)
#### Build individual targets ##################################################
+NODE_PRE_GYP = $(shell cd platform/node && npm bin)/node-pre-gyp
+node/configure:
+ cd platform/node && $(NODE_PRE_GYP) configure --clang -- \
+ $(GYP_FLAGS) -I../../config/$(HOST_SLUG).gypi \
+ -Dlibuv_ldflags= -Dlibuv_static_libs=
+
+Makefile/node: Makefile/__project__ node/configure
+ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n"
+ cd platform/node && $(NODE_PRE_GYP) build --clang -- \
+ -j$(JOBS)
+
Makefile/%: Makefile/__project__
@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n"
$(QUIET)$(ENV) $(MAKE) -C build/$(HOST_SLUG) BUILDTYPE=$(BUILDTYPE) $*