Merge branch 'master' of github.com:mapbox/mapbox-gl-native into jobs

This commit is contained in:
Dane Springmeyer
2014-10-30 12:19:30 -04:00
5 changed files with 61 additions and 42 deletions

View File

@@ -31,7 +31,7 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
# build OS X
#
mapbox_time "create_osx_project" \
make xproj-cli
make build/macosx/mapboxgl-app.xcodeproj
mapbox_time "build_osx" \
xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs $JOBS
@@ -45,7 +45,7 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
git submodule update
mapbox_time "create_ios_project" \
make iproj-cli
make build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj
mapbox_time "build_ios" \
xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs $JOBS