From bfcbae375bed8e919e610b3c8fbca7d1c83b8969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 21 Dec 2015 17:07:39 -0800 Subject: [PATCH] [osx] make osx with Xcode make osx now builds with Xcode instead of make, because building the OS X SDK and osxapp requires Xcode-specific build settings. make xosx and make nosx are now aliases to make osx. Fixes #3293. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 913d9034b..b06bb28af 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,11 @@ default: ; @printf "You must specify a valid target\n" ifeq ($(BUILD),osx) .PHONY: osx xosx nosx run-osx run-xosx -osx: ; $(RUN) HOST=osx HOST_VERSION=x86_64 Makefile/osxapp -xosx: ; $(RUN) HOST=osx HOST_VERSION=x86_64 Xcode/osxapp -nosx: ; $(RUN) HOST=osx HOST_VERSION=x86_64 Ninja/osxapp +osx: ; $(RUN) HOST=osx HOST_VERSION=x86_64 Xcode/osxapp +xosx: osx +nosx: osx run-osx: osx ; @"build/osx-x86_64/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL" -run-xosx: xosx ; @"gyp/build/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL" +run-xosx: run-xosx .PHONY: Xcode/osx Xcode/ios Xcode/ios: ; $(RUN) HOST=ios Xcode/__project__