[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.
This commit is contained in:
Minh Nguyễn
2015-12-21 17:07:39 -08:00
parent 3d37017c68
commit bfcbae375b

View File

@@ -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__