diff options
| author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-09 00:35:52 +1100 |
|---|---|---|
| committer | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-09 00:35:52 +1100 |
| commit | 70057e1b8eb40bf2d7ba85d7aae4e7c56eaefd99 (patch) | |
| tree | 8ab794252c48499c2fe366155cf5b454f80eb5c2 /Makefile | |
| parent | 30a420d9a3e2bcef2402cba17d1e3028ce5b9d1d (diff) | |
| parent | 9038e963bea3dc40d0ba422d3fa88c924c595da8 (diff) | |
| download | qtlocation-mapboxgl-70057e1b8eb40bf2d7ba85d7aae4e7c56eaefd99.tar.gz | |
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
gyp/common.gypi
include/mbgl/geometry/vao.hpp
include/mbgl/platform/event.hpp
include/mbgl/platform/gl.hpp
platform/default/http_request_baton_curl.cpp
src/storage/response.cpp
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -55,7 +55,7 @@ build/macosx/Makefile: macosx/mapboxgl-app.gyp config.gypi .PHONY: build/test/test.xcodeproj build/test/test.xcodeproj: test/test.gyp config.gypi - deps/run_gyp test/test.gyp -Iconfig.gypi -Dplatform=osx --depth=. -Goutput_dir=.. --generator-output=./build -f xcode + deps/run_gyp test/test.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build -f xcode .PHONY: build/macosx/mapboxgl-app.xcodeproj build/macosx/mapboxgl-app.xcodeproj: macosx/mapboxgl-app.gyp config.gypi |