summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile23
-rwxr-xr-xconfigure2
-rw-r--r--gyp/install.gypi12
-rw-r--r--gyp/mbgl-core.gypi1
-rw-r--r--linux/mapboxgl-app.gyp1
-rw-r--r--macosx/mapboxgl-app.gyp3
-rw-r--r--src/mbgl/map/map.cpp9
-rw-r--r--src/mbgl/renderer/symbol_bucket.cpp53
-rw-r--r--src/mbgl/renderer/symbol_bucket.hpp3
-rw-r--r--src/mbgl/shader/shader.cpp71
-rw-r--r--src/mbgl/util/merge_lines.hpp107
-rw-r--r--test/merge_lines.cpp73
-rw-r--r--test/test.gyp21
13 files changed, 306 insertions, 73 deletions
diff --git a/Makefile b/Makefile
index 6de809968e..c6e1101947 100644
--- a/Makefile
+++ b/Makefile
@@ -141,16 +141,21 @@ render: build/render/Makefile
##### Xcode projects ###########################################################
+.PHONY: clear_xcode_cache
clear_xcode_cache:
- @CUSTOM_DD=`defaults read com.apple.dt.Xcode IDECustomDerivedDataLocation 2>/dev/null`; \
- if [[ $$CUSTOM_DD ]]; then \
- echo clearing files in $$CUSTOM_DD older than one day; \
- find $$CUSTOM_DD/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
- fi; \
- if [[ -d ~/Library/Developer/Xcode/DerivedData/ ]] && [[ ! $$CUSTOM_DD ]]; then \
- echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* older than one day'; \
- find ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
- fi
+ @CUSTOM_DD=`defaults read com.apple.dt.Xcode IDECustomDerivedDataLocation 2>/dev/null`; \
+ if [[ $$CUSTOM_DD ]]; then \
+ echo clearing files in $$CUSTOM_DD older than one day; \
+ find $$CUSTOM_DD/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
+ fi; \
+ if [[ -d ~/Library/Developer/Xcode/DerivedData/ ]] && [[ ! $$CUSTOM_DD ]]; then \
+ echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* older than one day'; \
+ find ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
+ fi; \
+ if [[ -e ~/Library/Application\ Support/Mapbox\ GL/cache.db ]]; then \
+ echo 'removing ~/Library/Application\ Support/Mapbox\ GL/cache.db'; \
+ rm ~/Library/Application\ Support/Mapbox\ GL/cache.db; \
+ fi
xproj: build/macosx/mapboxgl-app.xcodeproj
open ./build/macosx/mapboxgl-app.xcodeproj
diff --git a/configure b/configure
index cc86f097c6..d80aa6bd47 100755
--- a/configure
+++ b/configure
@@ -38,7 +38,7 @@ case ${MASON_PLATFORM} in
;;
*)
GLFW_VERSION=e1ae9af5
- SQLITE_VERSION=system
+ SQLITE_VERSION=3.8.6
LIBPNG_VERSION=1.6.13
LIBJPEG_VERSION=v8d
LIBCURL_VERSION=system
diff --git a/gyp/install.gypi b/gyp/install.gypi
index 5338bfed1b..1c5066a9c0 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -17,7 +17,6 @@
{ 'files': [ '<(PRODUCT_DIR)/libmbgl-headless.a' ], 'destination': '<(install_prefix)/lib' },
{ 'files': [ '<(PRODUCT_DIR)/libmbgl-<(platform).a' ], 'destination': '<(install_prefix)/lib' },
{ 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' },
- { 'files': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' },
],
'variables': {
'conditions': [
@@ -47,6 +46,7 @@
'./utils/mbgl-config/build.sh',
'<(install_prefix)',
'<(platform)',
+ '<@(sqlite3_static_libs)',
'<@(sqlite3_ldflags)',
'<@(curl_ldflags)',
'<@(png_ldflags)',
@@ -55,6 +55,16 @@
}
]
},
+ { 'target_name': 'copy_version',
+ 'type': 'none',
+ 'hard_dependency': 1,
+ 'dependencies': [
+ 'install',
+ ],
+ 'copies': [
+ { 'files': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' },
+ ],
+ }
]
}],
],
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi
index ea279f2dad..aa30c5b4dd 100644
--- a/gyp/mbgl-core.gypi
+++ b/gyp/mbgl-core.gypi
@@ -85,6 +85,7 @@
'<(standalone_lib)',
'<@(uv_static_libs)',
'<@(curl_static_libs)',
+ '<@(sqlite3_static_libs)',
'<(core_lib)'
],
}
diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp
index 4127b5c278..60eb16de38 100644
--- a/linux/mapboxgl-app.gyp
+++ b/linux/mapboxgl-app.gyp
@@ -29,6 +29,7 @@
'variables': {
'ldflags': [
'<@(png_ldflags)',
+ '<@(sqlite3_static_libs)',
'<@(sqlite3_ldflags)',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp
index 6696ebc577..192604d3cf 100644
--- a/macosx/mapboxgl-app.gyp
+++ b/macosx/mapboxgl-app.gyp
@@ -39,6 +39,7 @@
'ldflags': [
'<@(uv_ldflags)',
'<@(uv_static_libs)',
+ '<@(sqlite3_static_libs)',
'<@(sqlite3_ldflags)',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
@@ -61,4 +62,4 @@
]
}
]
-} \ No newline at end of file
+}
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index f5948fbb22..d135ce0da8 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -301,6 +301,8 @@ void Map::run() {
mode = Mode::None;
fileSource.clearLoop();
}
+
+ terminate();
}
void Map::checkForPause() {
@@ -329,8 +331,9 @@ void Map::rerender() {
} else if (mode == Mode::Continuous) {
// We only send render events if we want to continuously update the map
// (== async rendering).
- assert(asyncRender);
- asyncRender->send();
+ if (asyncRender) {
+ asyncRender->send();
+ }
}
}
@@ -350,7 +353,9 @@ void Map::swapped() {
void Map::terminate() {
assert(painter);
+ view.activate();
painter->terminate();
+ view.deactivate();
}
#pragma mark - Setup
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index 0eadacec5a..c6a7c8c4e1 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -16,6 +16,7 @@
#include <mbgl/util/utf.hpp>
#include <mbgl/util/token.hpp>
#include <mbgl/util/math.hpp>
+#include <mbgl/util/merge_lines.hpp>
namespace mbgl {
@@ -85,11 +86,31 @@ std::vector<SymbolFeature> SymbolBucket::processFeatures(const VectorTileLayer &
}
if (ft.label.length() || ft.sprite.length()) {
- ft.geometry = feature.geometry;
+
+ auto &multiline = ft.geometry;
+
+ // Decode line
+ Geometry::command cmd;
+ pbf geom(feature.geometry);
+ Geometry geometry(geom);
+ bool first = true;
+ int32_t x, y;
+ while ((cmd = geometry.next(x, y)) != Geometry::end) {
+ if (first || cmd == Geometry::move_to) {
+ multiline.emplace_back();
+ first = false;
+ }
+ multiline.back().emplace_back(x, y);
+ }
+
features.push_back(std::move(ft));
}
}
+ if (properties.placement == PlacementType::Line) {
+ util::mergeLines(features);
+ }
+
glyphStore.waitForGlyphRanges(properties.text.font, ranges);
sprite.waitUntilLoaded();
@@ -146,6 +167,8 @@ void SymbolBucket::addFeatures(const VectorTileLayer &layer, const FilterExpress
const FontStack &fontStack = glyphStore.getFontStack(properties.text.font);
for (const SymbolFeature &feature : features) {
+ if (!feature.geometry.size()) continue;
+
Shaping shaping;
Rect<uint16_t> image;
GlyphPositions face;
@@ -181,32 +204,12 @@ void SymbolBucket::addFeatures(const VectorTileLayer &layer, const FilterExpress
// if either shaping or icon position is present, add the feature
if (shaping.size() || image) {
- addFeature(feature.geometry, shaping, face, image);
- }
- }
-}
-
-void SymbolBucket::addFeature(const pbf &geom_pbf, const Shaping &shaping,
- const GlyphPositions &face, const Rect<uint16_t> &image) {
- // Decode all lines.
- std::vector<Coordinate> line;
- Geometry::command cmd;
-
- Coordinate coord;
- pbf geom(geom_pbf);
- Geometry geometry(geom);
- int32_t x, y;
- while ((cmd = geometry.next(x, y)) != Geometry::end) {
- if (cmd == Geometry::move_to) {
- if (!line.empty()) {
- addFeature(line, shaping, face, image);
- line.clear();
+ for (const std::vector<Coordinate> &line : feature.geometry) {
+ if (line.size()) {
+ addFeature(line, shaping, face, image);
+ }
}
}
- line.emplace_back(x, y);
- }
- if (line.size()) {
- addFeature(line, shaping, face, image);
}
}
diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
index dd596b1a00..bc148579fa 100644
--- a/src/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -30,7 +30,7 @@ class FontStack;
class SymbolFeature {
public:
- pbf geometry;
+ std::vector<std::vector<Coordinate>> geometry;
std::u32string label;
std::string sprite;
};
@@ -77,7 +77,6 @@ private:
std::vector<SymbolFeature> processFeatures(const VectorTileLayer &layer, const FilterExpression &filter, GlyphStore &glyphStore, const Sprite &sprite);
- void addFeature(const pbf &geom_pbf, const Shaping &shaping, const GlyphPositions &face, const Rect<uint16_t> &image);
void addFeature(const std::vector<Coordinate> &line, const Shaping &shaping, const GlyphPositions &face, const Rect<uint16_t> &image);
diff --git a/src/mbgl/shader/shader.cpp b/src/mbgl/shader/shader.cpp
index 6e52126aa9..5eb354f852 100644
--- a/src/mbgl/shader/shader.cpp
+++ b/src/mbgl/shader/shader.cpp
@@ -27,40 +27,38 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo
// Load binary shader if it exists
bool skipCompile = false;
if (!binaryFileName.empty() && (gl::ProgramBinary != nullptr)) {
- std::ifstream binaryFile(binaryFileName, std::ios::in | std::ios::binary);
+ try {
+ std::ifstream binaryFile(binaryFileName, std::ios::in | std::ios::binary);
+ binaryFile.exceptions(std::ifstream::failbit | std::ifstream::badbit | std::ifstream::eofbit);
- GLsizei binaryLength;
- GLenum binaryFormat;
- binaryFile.read(reinterpret_cast<char *>(&binaryLength), sizeof(binaryLength));
- binaryFile.read(reinterpret_cast<char *>(&binaryFormat), sizeof(binaryFormat));
+ GLsizei binaryLength;
+ GLenum binaryFormat;
+ binaryFile.read(reinterpret_cast<char *>(&binaryLength), sizeof(binaryLength));
+ binaryFile.read(reinterpret_cast<char *>(&binaryFormat), sizeof(binaryFormat));
- GLint numBinaryFormats;
- MBGL_CHECK_ERROR(glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &numBinaryFormats));
+ GLint numBinaryFormats;
+ MBGL_CHECK_ERROR(glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &numBinaryFormats));
- std::unique_ptr<GLenum[]> validBinaryFormats = mbgl::util::make_unique<GLenum[]>(numBinaryFormats);
- MBGL_CHECK_ERROR(glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, reinterpret_cast<GLint *>(validBinaryFormats.get())));
+ std::unique_ptr<GLenum[]> validBinaryFormats = mbgl::util::make_unique<GLenum[]>(numBinaryFormats);
+ MBGL_CHECK_ERROR(glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, reinterpret_cast<GLint *>(validBinaryFormats.get())));
- bool validBinaryFormat = false;
- for (GLint i = 0; i < numBinaryFormats; i++) {
- if (validBinaryFormats[i] == binaryFormat) {
- validBinaryFormat = true;
+ bool validBinaryFormat = false;
+ for (GLint i = 0; i < numBinaryFormats; i++) {
+ if (validBinaryFormats[i] == binaryFormat) {
+ validBinaryFormat = true;
+ }
+ }
+ if (!validBinaryFormat) {
+ throw std::runtime_error("Trying load program binary with an invalid binaryFormat!");
}
- }
- if (!validBinaryFormat) {
- Log::Error(Event::OpenGL, "Trying load program binary with an invalid binaryFormat!");
- }
-
- if (binaryLength == 0) {
- Log::Error(Event::OpenGL, "Trying load program binary with a zero length binary!");
- }
- if (validBinaryFormat && (binaryLength != 0)) {
+ if (binaryLength == 0) {
+ throw std::runtime_error("Trying load program binary with a zero length binary!");
+ }
std::unique_ptr<char[]> binary = mbgl::util::make_unique<char[]>(binaryLength);
binaryFile.read(binary.get(), binaryLength);
- binaryFile.close();
- Log::Error(Event::OpenGL, "glProgramBinary(%u, %u, %u, %u)", program, binaryFormat, binary.get(), binaryLength);
MBGL_CHECK_ERROR(gl::ProgramBinary(program, binaryFormat, binary.get(), binaryLength));
// Check if the binary was valid
@@ -69,8 +67,8 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo
if (status == GL_TRUE) {
skipCompile = true;
}
- } else {
- binaryFile.close();
+ } catch(std::exception& e) {
+ Log::Error(Event::Shader, "Loading binary shader failed!");
// Delete the bad file
std::remove(binaryFileName.c_str());
@@ -214,12 +212,21 @@ Shader::~Shader() {
Log::Error(Event::OpenGL, "glGetProgramBinary(%u, %u, nullptr, %u, %u)", program, binaryLength, binaryFormat, binary.get());
- // Write the binary to a file
- std::ofstream binaryFile(binaryFileName, std::ios::out | std::ios::trunc | std::ios::binary);
- binaryFile.write(reinterpret_cast<char *>(&binaryLength), sizeof(binaryLength));
- binaryFile.write(reinterpret_cast<char *>(&binaryFormat), sizeof(binaryFormat));
- binaryFile.write(binary.get(), binaryLength);
- binaryFile.close();
+ try {
+ // Write the binary to a file
+ std::ofstream binaryFile(binaryFileName, std::ios::out | std::ios::trunc | std::ios::binary);
+ binaryFile.exceptions(std::ofstream::failbit | std::ofstream::badbit | std::ofstream::eofbit);
+
+ binaryFile.write(reinterpret_cast<char *>(&binaryLength), sizeof(binaryLength));
+ binaryFile.write(reinterpret_cast<char *>(&binaryFormat), sizeof(binaryFormat));
+ binaryFile.write(binary.get(), binaryLength);
+
+ } catch(std::exception& e) {
+ Log::Error(Event::Shader, "Saving binary shader failed!");
+
+ // Delete the bad file
+ std::remove(binaryFileName.c_str());
+ }
}
}
diff --git a/src/mbgl/util/merge_lines.hpp b/src/mbgl/util/merge_lines.hpp
new file mode 100644
index 0000000000..e0dd4c6415
--- /dev/null
+++ b/src/mbgl/util/merge_lines.hpp
@@ -0,0 +1,107 @@
+#ifndef MBGL_UTIL_MERGELINES
+#define MBGL_UTIL_MERGELINES
+
+#include <map>
+#include <string>
+#include <vector>
+#include <sstream>
+#include <mbgl/renderer/symbol_bucket.hpp>
+
+
+namespace mbgl {
+namespace util {
+
+unsigned int mergeFromRight(
+ std::vector<SymbolFeature> &features,
+ std::map<std::string,unsigned int> &rightIndex,
+ std::map<std::string,unsigned int>::iterator left,
+ std::string &rightKey,
+ std::vector<std::vector<Coordinate>> &geom) {
+
+ unsigned int index = left->second;
+ rightIndex.erase(left);
+ rightIndex[rightKey] = index;
+ features[index].geometry[0].pop_back();
+ features[index].geometry[0].insert(features[index].geometry[0].end(), geom[0].begin(), geom[0].end());
+ geom[0].clear();
+ return index;
+}
+
+unsigned int mergeFromLeft(
+ std::vector<SymbolFeature> &features,
+ std::map<std::string,unsigned int> &leftIndex,
+ std::string &leftKey,
+ std::map<std::string,unsigned int>::iterator right,
+ std::vector<std::vector<Coordinate>> &geom) {
+
+ unsigned int index = right->second;
+ leftIndex.erase(right);
+ leftIndex[leftKey] = index;
+ geom[0].pop_back();
+ geom[0].insert(geom[0].end(), features[index].geometry[0].begin(), features[index].geometry[0].end());
+ features[index].geometry[0].clear();
+ std::swap(features[index].geometry[0], geom[0]);
+ return index;
+}
+
+std::string getKey(const std::u32string &text, const std::vector<std::vector<Coordinate>> &geom, bool onRight) {
+ const Coordinate &coord = onRight ? geom[0].back() : geom[0].front();
+ std::ostringstream key;
+ for (const char32_t &c : text) {
+ key << (char)c;
+ }
+ key << ":" << coord.x << ":" << coord.y;
+ return key.str();
+}
+
+
+void mergeLines(std::vector<SymbolFeature> &features) {
+
+ std::map<std::string,unsigned int> leftIndex;
+ std::map<std::string,unsigned int> rightIndex;
+
+ for (unsigned int k = 0; k < features.size(); k++) {
+ SymbolFeature &feature = features[k];
+ std::vector<std::vector<Coordinate>> &geometry = feature.geometry;
+
+ if (!feature.label.length()) {
+ continue;
+ }
+
+ std::string leftKey = getKey(feature.label, geometry, false);
+ std::string rightKey = getKey(feature.label, geometry, true);
+
+ auto left = rightIndex.find(leftKey);
+ auto right = leftIndex.find(rightKey);
+
+ if ((left != rightIndex.end()) && (right != leftIndex.end()) && (left->second != right->second)) {
+ // found lines with the same text adjacent to both ends of the current line, merge all three
+ unsigned int j = mergeFromLeft(features, leftIndex, leftKey, right, geometry);
+ unsigned int i = mergeFromRight(features, rightIndex, left, rightKey, features[j].geometry);
+
+ leftIndex.erase(leftKey);
+ rightIndex.erase(rightKey);
+ rightIndex[getKey(feature.label, features[i].geometry, true)] = i;
+
+ } else if (left != rightIndex.end()) {
+ // found mergeable line adjacent to the start of the current line, merge
+ mergeFromRight(features, rightIndex, left, rightKey, geometry);
+
+ } else if (right != leftIndex.end()) {
+ // found mergeable line adjacent to the end of the current line, merge
+ mergeFromLeft(features, leftIndex, leftKey, right, geometry);
+
+ } else {
+ // no adjacent lines, add as a new item
+ leftIndex[leftKey] = k;
+ rightIndex[rightKey] = k;
+ }
+
+ }
+
+}
+
+} // end namespace util
+} // end namespace mbgl
+
+#endif
diff --git a/test/merge_lines.cpp b/test/merge_lines.cpp
new file mode 100644
index 0000000000..3c887105fa
--- /dev/null
+++ b/test/merge_lines.cpp
@@ -0,0 +1,73 @@
+#include "gtest/gtest.h"
+
+#include <mbgl/util/merge_lines.hpp>
+
+
+TEST(mergeLines, mergeLines) {
+
+ std::u32string a = U"a";
+ std::u32string b = U"b";
+
+ // merges lines with the same text
+ std::vector<mbgl::SymbolFeature> input1 = {
+ { {{{0, 0}, {1, 0}, {2, 0}}}, a, "" },
+ { {{{4, 0}, {5, 0}, {6, 0}}}, b, "" },
+ { {{{8, 0}, {9, 0}}}, a, "" },
+ { {{{2, 0}, {3, 0}, {4, 0}}}, a, "" },
+ { {{{6, 0}, {7, 0}, {8, 0}}}, a, "" },
+ { {{{5, 0}, {6, 0}}}, a, "" }
+ };
+
+ std::vector<mbgl::SymbolFeature> expected1 = {
+ { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}}}, a, "" },
+ { {{{4, 0}, {5, 0}, {6, 0}}}, b, "" },
+ { {{{5, 0}, {6, 0}, {7, 0}, {8, 0}, {9, 0}}}, a, "" },
+ { {{}}, a, "" },
+ { {{}}, a, "" },
+ { {{}}, a, "" }
+ };
+
+ mbgl::util::mergeLines(input1);
+
+ for (int i = 0; i < 6; i++) {
+ EXPECT_EQ(input1[i].geometry, expected1[i].geometry);
+ }
+
+ // mergeLines handles merge from both ends
+ std::vector<mbgl::SymbolFeature> input2 = {
+ { {{{0, 0}, {1, 0}, {2, 0}}}, a, "" },
+ { {{{4, 0}, {5, 0}, {6, 0}}}, a, "" },
+ { {{{2, 0}, {3, 0}, {4, 0}}}, a, "" }
+ };
+
+ std::vector<mbgl::SymbolFeature> expected2 = {
+ { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}}}, a, "" },
+ { {{}}, a, "" },
+ { {{}}, a, "" }
+ };
+
+ mbgl::util::mergeLines(input2);
+
+ for (int i = 0; i < 3; i++) {
+ EXPECT_EQ(input2[i].geometry, expected2[i].geometry);
+ }
+
+ // mergeLines handles circular lines
+ std::vector<mbgl::SymbolFeature> input3 = {
+ { {{{0, 0}, {1, 0}, {2, 0}}}, a, "" },
+ { {{{2, 0}, {3, 0}, {4, 0}}}, a, "" },
+ { {{{4, 0}, {0, 0}}}, a, "" }
+ };
+
+ std::vector<mbgl::SymbolFeature> expected3 = {
+ { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {0, 0}}}, a, "" },
+ { {{}}, a, "" },
+ { {{}}, a, "" }
+ };
+
+ mbgl::util::mergeLines(input3);
+
+ for (int i = 0; i < 3; i++) {
+ EXPECT_EQ(input3[i].geometry, expected3[i].geometry);
+ }
+}
diff --git a/test/test.gyp b/test/test.gyp
index e33cf36894..406e0b23a7 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -7,6 +7,7 @@
'variables' : {
'ldflags': [
'<@(uv_ldflags)',
+ '<@(sqlite3_static_libs)',
'<@(sqlite3_ldflags)',
'<@(curl_ldflags)',
'<@(png_ldflags)',
@@ -167,6 +168,25 @@
}]
]
},
+ { 'target_name': 'merge_lines',
+ 'product_name': 'test_merge_lines',
+ 'type': 'executable',
+ 'sources': [
+ './main.cpp',
+ './merge_lines.cpp',
+ ],
+ 'dependencies': [
+ '../deps/gtest/gtest.gyp:gtest',
+ '../mapboxgl.gyp:mbgl-standalone',
+ ],
+ 'include_dirs': [ '../src' ],
+ 'conditions': [
+ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
+ }, {
+ 'libraries': [ '<@(ldflags)' ],
+ }]
+ ]
+ },
{ 'target_name': 'headless',
'product_name': 'test_headless',
'type': 'executable',
@@ -236,6 +256,7 @@
'variant',
'tile',
'functions',
+ 'merge_lines',
'headless',
'style_parser',
'comparisons',
View Lorry Controller Status