diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-05-12 10:38:07 -0700 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-05-12 10:38:07 -0700 |
| commit | 755c51fcdd5236bb6e834888151b109d99e739d9 (patch) | |
| tree | 5b0126a752ebdad4cc3273288b517f8474214d53 /Makefile | |
| parent | 13988467ca2d63ac14468d9caf1e092d9975f667 (diff) | |
| parent | 2b1457998638e97660b5b19ba1e05341523030dd (diff) | |
| download | qtlocation-mapboxgl-755c51fcdd5236bb6e834888151b109d99e739d9.tar.gz | |
Merge branch 'master' of github.com:mapbox/llmr-native into clear-caches
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -7,10 +7,12 @@ V ?= 1 all: llmr # Builds the regular library -llmr: config.gypi llmr.gyp +llmr: config.gypi llmr.gyp node deps/run_gyp llmr.gyp --depth=. -Goutput_dir=.. --generator-output=./build/llmr -f make make -C build/llmr V=$(V) llmr-x86 +node: + @if [ ! `which node` ]; then echo 'error: depends on node.js. please make sure node is on your PATH'; exit 1; fi; ##### Test cases ############################################################### @@ -40,7 +42,7 @@ run-headless-test: build/test/Makefile # Builds the linux app with make. This is also used by Travis CI -linux: config.gypi linux/llmr-app.gyp +linux: config.gypi linux/llmr-app.gyp node deps/run_gyp linux/llmr-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make make -C build/linux V=$(V) linuxapp @@ -55,17 +57,17 @@ clear_xcode_cache: @if [[ -d ~/Library/Developer/Xcode/DerivedData/ ]]; then echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/ older than one day'; find ~/Library/Developer/Xcode/DerivedData/llmr-app-* -mtime +1 | xargs rm -rf; fi # build Mac OS X project for Xcode -xproj: config.gypi macosx/llmr-app.gyp clear_xcode_cache +xproj: config.gypi macosx/llmr-app.gyp clear_xcode_cache node deps/run_gyp macosx/llmr-app.gyp --depth=. --generator-output=./build -f xcode open ./build/macosx/llmr-app.xcodeproj # build iOS project for Xcode -iproj: config.gypi ios/llmr-app.gyp clear_xcode_cache +iproj: config.gypi ios/llmr-app.gyp clear_xcode_cache node deps/run_gyp ios/llmr-app.gyp --depth=. --generator-output=./build -f xcode open ./build/ios/llmr-app.xcodeproj # build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code) -lproj: config.gypi linux/llmr-app.gyp clear_xcode_cache +lproj: config.gypi linux/llmr-app.gyp clear_xcode_cache node deps/run_gyp linux/llmr-app.gyp --depth=. --generator-output=./build -f xcode open ./build/linux/llmr-app.xcodeproj |