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

[qt] Fix build when building the Qt Location plugin

Browse Source 
- MinGW has to explicitly know that is building a static library.
- Android doesn't have 'round' on the std:: namespace when using g++.
This commit is contained in:
Thiago Marcos P. Santos
2018-05-14 16:44:43 +03:00
parent 28da56465e
commit 07ad29d30d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/qt/include/qmapbox.hpp
View File

@@ -9,10 +9,14 @@
// This header follows the Qt coding style: https://wiki.qt.io/Qt_Coding_Style
#if defined(QT_BUILD_MAPBOXGL_LIB)
#define Q_MAPBOXGL_EXPORT Q_DECL_EXPORT
#if !defined(QT_MAPBOXGL_STATIC)
# if defined(QT_BUILD_MAPBOXGL_LIB)
# define Q_MAPBOXGL_EXPORT Q_DECL_EXPORT
# else
# define Q_MAPBOXGL_EXPORT Q_DECL_IMPORT
# endif
#else
#define Q_MAPBOXGL_EXPORT Q_DECL_IMPORT
# define Q_MAPBOXGL_EXPORT
#endif
namespace QMapbox {

2
src/mbgl/style/expression/compound_expression.cpp
View File

@@ -364,7 +364,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
return result;
});
define("round", [](double x) -> Result<double> { return std::round(x); });
define("round", [](double x) -> Result<double> { return ::round(x); });
define("floor", [](double x) -> Result<double> { return std::floor(x); });
define("ceil", [](double x) -> Result<double> { return std::ceil(x); });
define("abs", [](double x) -> Result<double> { return std::abs(x); });