diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-22 13:51:44 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-22 14:07:05 -0700 |
| commit | 55118e5bd724c62b50cdf7e8158e3bdef446534f (patch) | |
| tree | 999467dac608ce16abd0dfec5c8a1be037bbff3e /Makefile | |
| parent | 10087877457eda8017cc17fa25a4fbd5815e96cc (diff) | |
| download | qtlocation-mapboxgl-55118e5bd724c62b50cdf7e8158e3bdef446534f.tar.gz | |
Revert "build on trusty"
This reverts commit decc493ec8c30d66bcdf3aa19f58972eb045b5dc.
Conflicts:
.mason
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 6 insertions, 15 deletions
@@ -26,12 +26,8 @@ config/%.gypi: configure styles/styles: git submodule update --init styles -ifeq ($(shell uname -s), Darwin) SMCalloutView: git submodule update --init platform/ios/vendor/SMCalloutView -else -SMCalloutView: -endif #### Library builds ############################################################ @@ -74,9 +70,8 @@ Xcode/test: test/test.gyp config/osx.gypi styles/styles SMCalloutView xtest-proj: Xcode/test open ./build/osx/test/test.xcodeproj -xtest: XCPRETTY := $(shell ./scripts/xcpretty.sh) xtest: Xcode/test - xcodebuild -project ./build/osx/test/test.xcodeproj -configuration $(BUILDTYPE) -target test -jobs $(JOBS) $(XCPRETTY) + xcodebuild -project ./build/osx/test/test.xcodeproj -configuration $(BUILDTYPE) -target test -jobs $(JOBS) xtest-%: xtest ./scripts/run_tests.sh "build/osx/Build/Products/$(BUILDTYPE)/test" --gtest_filter=$* @@ -104,9 +99,8 @@ Xcode/osx: macosx/mapboxgl-app.gyp config/osx.gypi styles/styles xosx-proj: Xcode/osx open ./build/osx/macosx/mapboxgl-app.xcodeproj -xosx: XCPRETTY := $(shell ./scripts/xcpretty.sh) xosx: Xcode/osx - xcodebuild -project ./build/osx/macosx/mapboxgl-app.xcodeproj -configuration $(BUILDTYPE) -target osxapp -jobs $(JOBS) $(XCPRETTY) + xcodebuild -project ./build/osx/macosx/mapboxgl-app.xcodeproj -configuration $(BUILDTYPE) -target osxapp -jobs $(JOBS) run-xosx: xosx "build/osx/Build/Products/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL" @@ -126,16 +120,14 @@ Xcode/ios: ios/app/mapboxgl-app.gyp config/ios.gypi styles/styles SMCalloutView ios-proj: Xcode/ios open ./build/ios/ios/app/mapboxgl-app.xcodeproj -ios: XCPRETTY := $(shell ./scripts/xcpretty.sh) ios: Xcode/ios - xcodebuild -sdk iphoneos ARCHS="arm64 armv7 armv7s" PROVISIONING_PROFILE="2b532944-bf3d-4bf4-aa6c-a81676984ae8" -project ./build/ios/ios/app/mapboxgl-app.xcodeproj -configuration Release -target iosapp -jobs $(JOBS) $(XCPRETTY) + xcodebuild -sdk iphoneos ARCHS="arm64 armv7 armv7s" PROVISIONING_PROFILE="2b532944-bf3d-4bf4-aa6c-a81676984ae8" -project ./build/ios/ios/app/mapboxgl-app.xcodeproj -configuration Release -target iosapp -jobs $(JOBS) -isim: XCPRETTY := $(shell ./scripts/xcpretty.sh) isim: Xcode/ios - xcodebuild -sdk iphonesimulator ARCHS="x86_64 i386" -project ./build/ios/ios/app/mapboxgl-app.xcodeproj -configuration Debug -target iosapp -jobs $(JOBS) $(XCPRETTY) + xcodebuild -sdk iphonesimulator ARCHS="x86_64 i386" -project ./build/ios/ios/app/mapboxgl-app.xcodeproj -configuration Debug -target iosapp -jobs $(JOBS) ipackage: clean Xcode/ios - ./scripts/ios/package.sh + ./scripts/package_ios.sh # Legacy name iproj: ios-proj @@ -163,9 +155,8 @@ Xcode/linux: linux/mapboxgl-app.gyp config/osx.gypi styles/styles xlinux-proj: Xcode/linux open ./build/osx/linux/mapboxgl-app.xcodeproj -xlinux: XCPRETTY := $(shell ./scripts/xcpretty.sh) xlinux: Xcode/linux - xcodebuild -project ./build/osx/linux/mapboxgl-app.xcodeproj -configuration $(BUILDTYPE) -target linuxapp $(XCPRETTY) + xcodebuild -project ./build/osx/linux/mapboxgl-app.xcodeproj -configuration $(BUILDTYPE) -target linuxapp run-xlinux: xlinux "build/osx/Build/Products/$(BUILDTYPE)/mapbox-gl" |