From 2d33ae5ed77cbea3dc7352c23fa6a6fa91dc8a02 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 18 Apr 2016 17:38:51 -0700 Subject: [ios, osx] Eliminate use of main.mk --- scripts/main.mk | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'scripts') diff --git a/scripts/main.mk b/scripts/main.mk index 8791f3a2df..4c7f0d4794 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -77,13 +77,6 @@ Makefile/__project__: $(PLATFORM_CONFIG_OUTPUT) @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n" $(ENV) deps/run_gyp platform/$(PLATFORM)/platform.gyp $(GYP_FLAGS) -f make$(GYP_FLAVOR_SUFFIX) -.PHONY: Xcode/__project__ -Xcode/__project__: $(PLATFORM_CONFIG_OUTPUT) - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Exporting gyp variables to xcconfig...$(FORMAT_END)\n" - $(ENV) ./scripts/export-xcconfig.py $(PLATFORM_CONFIG_OUTPUT) $(PLATFORM_OUTPUT)/mbgl.xcconfig - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n" - $(ENV) deps/run_gyp platform/$(PLATFORM)/platform.gyp $(GYP_FLAGS) -f xcode$(GYP_FLAVOR_SUFFIX) - .PHONY: Ninja/__project__ Ninja/__project__: $(PLATFORM_CONFIG_OUTPUT) @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Recreating project...$(FORMAT_END)\n" @@ -108,16 +101,6 @@ Makefile/%: Makefile/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" $(ENV) $(MAKE) -j$(JOBS) -C $(PLATFORM_OUTPUT) BUILDTYPE=$(BUILDTYPE) $* -Xcode/%: Xcode/__project__ - @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" - set -o pipefail && xcodebuild \ - CODE_SIGNING_REQUIRED=NO \ - CODE_SIGN_IDENTITY= \ - -project $(PLATFORM_OUTPUT)/platform/$(PLATFORM)/platform.xcodeproj \ - -configuration $(BUILDTYPE) \ - -target $* \ - -jobs $(JOBS) | xcpretty - Ninja/%: Ninja/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" $(ENV) deps/ninja/ninja-$(PLATFORM) -C $(PLATFORM_OUTPUT)/$(BUILDTYPE) $* -- cgit v1.2.1