diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-21 15:02:47 +1300 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-21 15:02:47 +1300 |
| commit | df19683b6a871350c9f5ef2576d327ef2033d56c (patch) | |
| tree | e27e22d7e06310cc45b705b4b5b7342cd9e9ba42 /Makefile | |
| parent | 38e2f9831425e7a6dc2d69bd5fa196a5b7cb836f (diff) | |
| parent | 2731b582f24063e339c047635c6d7b2316eb8037 (diff) | |
| download | qtlocation-mapboxgl-df19683b6a871350c9f5ef2576d327ef2033d56c.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
Makefile
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -53,6 +53,10 @@ build/linux/Makefile: linux/mapboxgl-app.gyp config.gypi build/macosx/Makefile: macosx/mapboxgl-app.gyp config.gypi deps/run_gyp macosx/mapboxgl-app.gyp -Iconfig.gypi -Dplatform=osx --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make +.PHONY: build/render/Makefile +build/render/Makefile: bin/render.gyp config.gypi + deps/run_gyp bin/render.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/render -f make + .PHONY: build/test/test.xcodeproj build/test/test.xcodeproj: test/test.gyp config.gypi deps/run_gyp test/test.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build -f xcode @@ -69,6 +73,10 @@ build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj: ios/mapbox-gl-cocoa/app/ma build/linux/mapboxgl-app.xcodeproj: linux/mapboxgl-app.gyp config.gypi deps/run_gyp linux/mapboxgl-app.gyp -Iconfig.gypi -Dplatform=linux --depth=. --generator-output=./build -f xcode +.PHONY: build/bin/render.xcodeproj + build/bin/render.xcodeproj: bin/render.gyp config.gypi + deps/run_gyp bin/render.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. --generator-output=./build -f xcode + .PHONY: android android: ./scripts/local_mason.sh && \ @@ -126,6 +134,10 @@ osx: build/macosx/Makefile run-osx: osx build/$(BUILDTYPE)/Mapbox\ GL.app/Contents/MacOS/MAPBOX\ GL +# Builds the CLI render app +render: build/render/Makefile + $(MAKE) -C build/render BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-render + ##### Xcode projects ########################################################### clear_xcode_cache: @@ -145,6 +157,9 @@ xproj: build/macosx/mapboxgl-app.xcodeproj iproj: build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj open ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj +rproj: build/bin/render.xcodeproj + open ./build/bin/render.xcodeproj + # build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code) lproj: build/linux/mapboxgl-app.xcodeproj open ./build/linux/mapboxgl-app.xcodeproj |