diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2015-12-21 17:07:39 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2015-12-21 19:50:41 -0800 |
| commit | bfcbae375bed8e919e610b3c8fbca7d1c83b8969 (patch) | |
| tree | a3a3d8acd7a49d3dd8e662ca99795e9b8976d9dd /Makefile | |
| parent | 3d37017c6858c31d0e62414b410e96a4fcd4fa99 (diff) | |
| download | qtlocation-mapboxgl-bfcbae375bed8e919e610b3c8fbca7d1c83b8969.tar.gz | |
[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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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__ |