diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-09-01 15:51:29 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-09-01 15:51:29 -0400 |
| commit | 0e79d56b0939de9f4722350a34ab76554a23431c (patch) | |
| tree | b4fd9f7dbebfcdde7fb1445d1dc4671daa1607d7 /scripts | |
| parent | c4c3b5bc71c38fe6d6c0df0ddb38c57dfd2767ab (diff) | |
| download | qtlocation-mapboxgl-0e79d56b0939de9f4722350a34ab76554a23431c.tar.gz | |
move package.json and binding.gyp to root, drop tiles.tilejson
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/main.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/main.mk b/scripts/main.mk index 120b13c3c7..c5319cf3d1 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -70,6 +70,7 @@ 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,26 +86,25 @@ GYP_FLAGS += --generator-output=./build/$(HOST_SLUG) 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) \ - -Iconfig/$(HOST_SLUG).gypi -f make$(GYP_FLAVOR_SUFFIX) + -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) \ - -Iconfig/$(HOST_SLUG).gypi -f xcode$(GYP_FLAVOR_SUFFIX) + -f xcode$(GYP_FLAVOR_SUFFIX) #### Build individual targets ################################################## -NODE_PRE_GYP = $(shell cd platform/node > /dev/null && npm bin)/node-pre-gyp +NODE_PRE_GYP = $(shell 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= + $(QUIET)$(ENV) $(NODE_PRE_GYP) configure --clang -- \ + $(GYP_FLAGS) -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) + $(QUIET)$(ENV) $(NODE_PRE_GYP) build --clang -- \ + -j$(JOBS) Makefile/%: Makefile/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" |