From 995bbda1f7b4cb4a6c55ff75c7180d23cde2a453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 30 Oct 2014 11:36:41 -0400 Subject: [PATCH] use the correct makefile names for building the project --- ios/mapbox-gl-cocoa | 2 +- scripts/travis_script.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa index 80fd792b9..f395112c3 160000 --- a/ios/mapbox-gl-cocoa +++ b/ios/mapbox-gl-cocoa @@ -1 +1 @@ -Subproject commit 80fd792b9922868ad27510657f8eb0aad7d4d2ea +Subproject commit f395112c34ecc754812d4325102ee273fa8ced01 diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 8e2f92163..8f112cdb8 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 4 @@ -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 4