diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-30 12:19:30 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-30 12:19:30 -0400 |
| commit | 71a6f570a2de4fccb8dd44542f802b02f6c241f6 (patch) | |
| tree | 3f2e987bc59f8075ae6908d06ed9fb61cf52915b /scripts | |
| parent | 64f383e3f67ff54da2ef68c549bef7dd9d0eb5d1 (diff) | |
| parent | b3e0f75e4aa90394c5a4bda845e9843ad953cc92 (diff) | |
| download | qtlocation-mapboxgl-71a6f570a2de4fccb8dd44542f802b02f6c241f6.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into jobs
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis_script.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index d301c0efd3..5fa5a3f5f3 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -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 |