diff options
Diffstat (limited to 'platform/linux')
| -rw-r--r-- | platform/linux/main.cpp | 2 | ||||
| -rw-r--r-- | platform/linux/mapboxgl-app.gypi | 18 | ||||
| -rwxr-xr-x | platform/linux/scripts/coveralls.sh | 13 | ||||
| -rwxr-xr-x | platform/linux/scripts/run.sh | 3 |
4 files changed, 29 insertions, 7 deletions
diff --git a/platform/linux/main.cpp b/platform/linux/main.cpp index f90b5de849..98fb32075e 100644 --- a/platform/linux/main.cpp +++ b/platform/linux/main.cpp @@ -106,8 +106,6 @@ int main(int argc, char *argv[]) { view = std::make_unique<GLFWView>(fullscreen, benchmark); mbgl::DefaultFileSource fileSource("/tmp/mbgl-cache.db", "."); - fileSource.setMaximumCacheEntrySize(1 * 1024 * 1024); // 1 MB - fileSource.setMaximumCacheSize(50 * 1024 * 1024); // 50 MB // Set access token if present const char *token = getenv("MAPBOX_ACCESS_TOKEN"); diff --git a/platform/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi index 3788efba43..533f0b85d2 100644 --- a/platform/linux/mapboxgl-app.gypi +++ b/platform/linux/mapboxgl-app.gypi @@ -28,6 +28,7 @@ '<@(opengl_cflags)', '<@(boost_cflags)', '<@(glfw_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(glfw_ldflags)', @@ -39,20 +40,27 @@ 'conditions': [ ['OS == "mac"', { - 'libraries': [ '<@(libraries)' ], 'xcode_settings': { 'SDKROOT': 'macosx', 'SUPPORTED_PLATFORMS':'macosx', 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], - 'OTHER_LDFLAGS': [ '<@(ldflags)' ], - 'SDKROOT': 'macosx', 'MACOSX_DEPLOYMENT_TARGET': '10.10', - } + }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], - 'libraries': [ '<@(libraries)', '<@(ldflags)' ], }] ], + + 'link_settings': { + 'conditions': [ + ['OS == "mac"', { + 'libraries': [ '<@(libraries)' ], + 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } + }, { + 'libraries': [ '<@(libraries)', '<@(ldflags)' ], + }] + ], + }, }, ], } diff --git a/platform/linux/scripts/coveralls.sh b/platform/linux/scripts/coveralls.sh new file mode 100755 index 0000000000..468fa4774b --- /dev/null +++ b/platform/linux/scripts/coveralls.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +source ./platform/linux/scripts/setup.sh + +################################################################################ +# Coveralls +################################################################################ + +mapbox_time "make_coveralls" \ +make coveralls -j${JOBS} diff --git a/platform/linux/scripts/run.sh b/platform/linux/scripts/run.sh index 3e40881ec6..1c0c13968a 100755 --- a/platform/linux/scripts/run.sh +++ b/platform/linux/scripts/run.sh @@ -17,6 +17,9 @@ make linux -j${JOBS} BUILDTYPE=${BUILDTYPE} mapbox_time "compile_render_binary" \ make render -j${JOBS} BUILDTYPE=${BUILDTYPE} +mapbox_time "compile_offline_binary" \ +make offline -j${JOBS} BUILDTYPE=${BUILDTYPE} + mapbox_time "compile_tests" \ make test -j${JOBS} BUILDTYPE=${BUILDTYPE} |