Pull in maplibre-native-base repo (#3389)
This commit is contained in:
@@ -239,7 +239,7 @@ target_link_libraries(maplibre
|
||||
$<$<CONFIG:Release>:-Wl,--gc-sections>
|
||||
$<$<CONFIG:Release>:-flto>
|
||||
$<$<CONFIG:Release>:-fuse-ld=gold>
|
||||
Mapbox::Base::jni.hpp
|
||||
MapLibreNative::Base::jni.hpp
|
||||
mbgl-core
|
||||
mbgl-vendor-unique_resource)
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@ target_link_libraries(
|
||||
PRIVATE
|
||||
EGL
|
||||
GLESv3
|
||||
Mapbox::Base::jni.hpp
|
||||
MapLibreNative::Base::jni.hpp
|
||||
android
|
||||
atomic
|
||||
jnigraphics
|
||||
@@ -125,7 +125,7 @@ target_link_libraries(
|
||||
example-custom-layer
|
||||
PRIVATE
|
||||
GLESv3
|
||||
Mapbox::Base
|
||||
MapLibreNative::Base
|
||||
log
|
||||
mbgl-compiler-options
|
||||
)
|
||||
@@ -160,7 +160,7 @@ find_package(curl CONFIG)
|
||||
target_link_libraries(
|
||||
mbgl-test-runner
|
||||
PRIVATE
|
||||
Mapbox::Base::jni.hpp
|
||||
MapLibreNative::Base::jni.hpp
|
||||
mbgl-compiler-options
|
||||
$<$<BOOL:${curl_FOUND}>:curl::curl_static>
|
||||
$<LINK_LIBRARY:WHOLE_ARCHIVE,mbgl-test>
|
||||
@@ -214,7 +214,7 @@ target_include_directories(
|
||||
target_link_libraries(
|
||||
mbgl-benchmark-runner
|
||||
PRIVATE
|
||||
Mapbox::Base::jni.hpp
|
||||
MapLibreNative::Base::jni.hpp
|
||||
mbgl-compiler-options
|
||||
$<LINK_LIBRARY:WHOLE_ARCHIVE,mbgl-benchmark>
|
||||
)
|
||||
@@ -265,7 +265,7 @@ target_include_directories(
|
||||
target_link_libraries(
|
||||
mbgl-render-test-runner
|
||||
PRIVATE
|
||||
Mapbox::Base::jni.hpp
|
||||
MapLibreNative::Base::jni.hpp
|
||||
android
|
||||
log
|
||||
mbgl-compiler-options
|
||||
|
||||
@@ -128,12 +128,11 @@ endif()
|
||||
target_link_libraries(
|
||||
mbgl-glfw
|
||||
PRIVATE
|
||||
Mapbox::Base::Extras::args
|
||||
Mapbox::Base::Extras::filesystem
|
||||
Mapbox::Base::Extras::rapidjson
|
||||
MapLibreNative::Base::Extras::args
|
||||
MapLibreNative::Base::Extras::rapidjson
|
||||
Mapbox::Map
|
||||
mbgl-compiler-options
|
||||
Mapbox::Base::cheap-ruler-cpp
|
||||
MapLibreNative::Base::cheap-ruler-cpp
|
||||
)
|
||||
|
||||
if(NOT WIN32 AND MLN_WITH_OPENGL)
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
#include <rapidjson/prettywriter.h>
|
||||
#include <rapidjson/stringbuffer.h>
|
||||
#include <rapidjson/writer.h>
|
||||
#include <ghc/filesystem.hpp>
|
||||
|
||||
#include <cmath>
|
||||
#include <fstream>
|
||||
#include <utility>
|
||||
#include <filesystem>
|
||||
|
||||
using Writer = rapidjson::PrettyWriter<rapidjson::StringBuffer>;
|
||||
|
||||
@@ -117,7 +117,7 @@ TestWriter& TestWriter::withInitialSize(const mbgl::Size& size) {
|
||||
}
|
||||
|
||||
bool TestWriter::write(const std::string& dir) const {
|
||||
namespace fs = ghc::filesystem;
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
fs::path rootDir(dir);
|
||||
if (!fs::exists(rootDir)) {
|
||||
|
||||
@@ -43,7 +43,7 @@ target_include_directories(
|
||||
target_link_libraries(
|
||||
mbgl-node-loop
|
||||
PUBLIC
|
||||
Mapbox::Base
|
||||
MapLibreNative::Base
|
||||
)
|
||||
|
||||
target_sources(
|
||||
|
||||
Reference in New Issue
Block a user