tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #541 from ljbade/android-mason

Browse Source 
Android mason: Get build working on Ubuntu
This commit is contained in:
Dane Springmeyer
2014-11-04 17:21:04 -05:00
parent d74a98899f 991c497e43
commit 75953b1970
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -6,6 +6,7 @@
/mason_packages
/config.gypi
/config-ios.gypi
/config-android.gypi
/config/constants_local.cpp
/build
/include/mbgl/shader/shaders.hpp

18
Makefile
View File

@@ -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

2
configure vendored
View File

@@ -28,7 +28,7 @@ case ${MASON_PLATFORM} in
SQLITE_VERSION=3.8.6
LIBUV_VERSION=0.11.29
ZLIB_VERSION=system
BOOST_VERSION=system
BOOST_VERSION=1.57.0
NUNICODE_VERSION=1.4
;;
*)