diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-23 15:26:26 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-25 21:37:58 -0700 |
| commit | 45c5b2a66c8dbadf8671458d183e76a981ff4843 (patch) | |
| tree | f042e705b0d1f19329bf899b97dbf37242bdfb89 /Makefile | |
| parent | 4e2c743ebabbbd78e49b1f645def99aaa328324e (diff) | |
| download | qtlocation-mapboxgl-45c5b2a66c8dbadf8671458d183e76a981ff4843.tar.gz | |
[core] Share shaders with gl-js
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -16,6 +16,8 @@ else export XCPRETTY ?= | xcpretty endif +default: test-$(HOST_PLATFORM) + ifneq (,$(wildcard .git/.)) .mason: git submodule update --init @@ -23,7 +25,8 @@ else .mason: ; endif -default: test-$(HOST_PLATFORM) +node_modules: package.json + npm update # Install dependencies but don't run our own install script. GYP = deps/run_gyp --depth=. -Goutput_dir=. @@ -31,7 +34,7 @@ CONFIG_DEPENDENCIES = .mason configure # Depend on gyp includes plus directories, so that projects are regenerated when # files are added or removed. -GYP_DEPENDENCIES = mbgl.gypi test/test.gypi bin/*.gypi $(shell find src include -type d) +GYP_DEPENDENCIES = mbgl.gypi test/test.gypi bin/*.gypi $(shell find src include -type d) node_modules #### OS X targets ############################################################## @@ -179,9 +182,6 @@ apackage: NODE_PRE_GYP = $(shell npm bin)/node-pre-gyp NODE_OUTPUT_PATH = build/node-$(HOST_PLATFORM)-$(shell uname -m) -node_modules: package.json - npm update # Install dependencies but don't run our own install script. - $(NODE_OUTPUT_PATH)/config.gypi: platform/$(HOST_PLATFORM)/scripts/configure.sh $(CONFIG_DEPENDENCIES) ./configure $< $@ $(HOST_PLATFORM) $(shell uname -m) |