From b611a6f5dc1e4d292eeb18e8be61b3fe327ab1e5 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 23 May 2016 18:42:42 -0700 Subject: [build] Inline main.mk node targets into Makefile --- scripts/main.mk | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'scripts') diff --git a/scripts/main.mk b/scripts/main.mk index cf062afc73..dd05e633ab 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -24,12 +24,6 @@ else ifeq ($(PLATFORM),qt) # Cross compilation support ENV = $(shell MASON_PLATFORM_VERSION=$(CONFIGURE_SUBPLATFORM) ./platform/qt/scripts/toolchain.sh) -else ifeq ($(PLATFORM),node) - CONFIGURE_PLATFORM = $(HOST_PLATFORM) - CONFIGURE_SUBPLATFORM = $(shell uname -m) - CONFIGURE_INPUT = platform/$(HOST_PLATFORM)/scripts/configure.sh - PLATFORM_OUTPUT = ./build/node-$(HOST_PLATFORM)-$(CONFIGURE_SUBPLATFORM) - else CONFIGURE_PLATFORM = $(PLATFORM) CONFIGURE_SUBPLATFORM = $(shell uname -m) @@ -37,12 +31,6 @@ else PLATFORM_OUTPUT = ./build/$(PLATFORM)-$(CONFIGURE_SUBPLATFORM) endif -ifneq (,$(findstring clang,$(CXX))) - CXX_HOST = "clang" -else ifneq (,$(findstring g++,$(CXX))) - CXX_HOST = "g++" -endif - # Text formatting TEXT_BOLD = \033[1m COLOR_GREEN = \033[32m @@ -87,19 +75,6 @@ Ninja/__project__: $(CONFIGURE_OUTPUT) @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n" $(ENV) deps/run_gyp platform/$(PLATFORM)/platform.gyp $(GYP_FLAGS) -f ninja -#### Node targets ############################################################## - -NODE_PRE_GYP = $(shell npm bin)/node-pre-gyp - -Makefile/node: $(CONFIGURE_OUTPUT) - $(NODE_PRE_GYP) configure --clang -- $(GYP_FLAGS) \ - -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= - $(NODE_PRE_GYP) build --clang - -Xcode/node: $(CONFIGURE_OUTPUT) - $(NODE_PRE_GYP) configure --clang -- $(GYP_FLAGS) -f xcode \ - -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= - #### Build individual targets ################################################## Makefile/%: Makefile/__project__ -- cgit v1.2.1