diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | bin/render.gyp | 6 |
2 files changed, 10 insertions, 5 deletions
@@ -55,7 +55,7 @@ build/macosx/Makefile: macosx/mapboxgl-app.gyp config.gypi .PHONY: build/render/Makefile build/render/Makefile: bin/render.gyp config.gypi - deps/run_gyp bin/render.gyp -Iconfig.gypi -Dplatform=osx --depth=. -Goutput_dir=.. --generator-output=./build/render -f make + 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 @@ -73,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 + ##### Test cases ############################################################### test: build/test/Makefile @@ -128,6 +132,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 diff --git a/bin/render.gyp b/bin/render.gyp index 9fb6066eb5..9ad9e7481f 100644 --- a/bin/render.gyp +++ b/bin/render.gyp @@ -1,8 +1,6 @@ { 'includes': [ '../gyp/common.gypi', - '../gyp/version.gypi', - '../gyp/mbgl-platform.gypi', ], 'targets': [ { @@ -45,9 +43,9 @@ ], 'include_dirs': [ '../src' ], 'dependencies': [ - '../mapboxgl.gyp:mbgl-core', + '../mapboxgl.gyp:mbgl-standalone', '../mapboxgl.gyp:mbgl-headless', - '<(platform_library)', + '../mapboxgl.gyp:mbgl-<(platform)', ], }, ], |