summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeith Bade <leith@leithalweapon.geek.nz>2014-11-04 22:36:04 +1100
committerLeith Bade <leith@leithalweapon.geek.nz>2014-11-04 22:36:04 +1100
commit574c0f5fa009239a3474e3dc19a1835ac41bee8b (patch)
tree41dba92ed5e61f7b52eb9e08109202a72ebc2779
parentd74a98899ffd80e6300ad1c4185151f472fd8d0e (diff)
downloadqtlocation-mapboxgl-574c0f5fa009239a3474e3dc19a1835ac41bee8b.tar.gz
Fix file not found errors
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index ba1fc78758..54ee9e749c 100644
--- a/Makefile
+++ b/Makefile
@@ -71,15 +71,15 @@ build/linux/mapboxgl-app.xcodeproj: linux/mapboxgl-app.gyp config.gypi
.PHONY: android
android:
- export CXX="`MASON_PLATFORM=android ./.mason/mason env CXX`" && \
- export CC="`MASON_PLATFORM=android ./.mason/mason env CC`" && \
- export LD="`MASON_PLATFORM=android ./.mason/mason env LD`" && \
- export AR="`MASON_PLATFORM=android ./.mason/mason env AR`" && \
- export RANLIB="`MASON_PLATFORM=android ./.mason/mason env RANLIB`" && \
- export LDFLAGS="`MASON_PLATFORM=android ./.mason/mason env LDFLAGS` ${LDFLAGS}" && \
- export CFLAGS="`MASON_PLATFORM=android ./.mason/mason env CFLAGS` ${CFLAGS}" && \
- export CPPFLAGS="`MASON_PLATFORM=android ./.mason/mason env CPPFLAGS` ${CPPFLAGS}" && \
- export PATH="`MASON_PLATFORM=android ./.mason/mason env PATH`:${PATH}" && \
+ export CXX="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env CXX`" && \
+ export CC="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env CC`" && \
+ export LD="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env LD`" && \
+ export AR="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env AR`" && \
+ export RANLIB="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env RANLIB`" && \
+ export LDFLAGS="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env LDFLAGS` ${LDFLAGS}" && \
+ export CFLAGS="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env CFLAGS` ${CFLAGS}" && \
+ export CPPFLAGS="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env CPPFLAGS` ${CPPFLAGS}" && \
+ export PATH="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env PATH`:${PATH}" && \
MASON_PLATFORM=android ./configure config-android.gypi && \
deps/run_gyp mapboxgl.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android -f make-android && \
$(MAKE) -C ./build/android BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-core