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

fix another path to mason

Browse Source
This commit is contained in:
Dane Springmeyer
2014-11-01 22:57:14 -04:00
parent fbd71f6929
commit cdcc30fa4a
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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` && \
export CFLAGS=`MASON_PLATFORM=android ~/.mason/mason env CFLAGS` && \
export CPPFLAGS=`MASON_PLATFORM=android ~/.mason/mason env CPPFLAGS` && \
export PATH=`MASON_PLATFORM=android ~/.mason/mason env PATH` && \
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` && \
export CFLAGS=`MASON_PLATFORM=android ./.mason/mason env CFLAGS` && \
export CPPFLAGS=`MASON_PLATFORM=android ./.mason/mason env CPPFLAGS` && \
export PATH=`MASON_PLATFORM=android ./.mason/mason env 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

6
scripts/travis_script.sh
View File

@@ -10,8 +10,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
#
# build & test Linux
#
mapbox_time "compile_program" \
make android -j$JOBS BUILDTYPE=${BUILDTYPE}
if [[ $MASON_PLATFORM == "android" ]]; then
mapbox_time "compile_program" \
make android -j$JOBS BUILDTYPE=${BUILDTYPE}
fi
mapbox_time "compile_tests" \
make test -j$JOBS BUILDTYPE=${BUILDTYPE}