Update to upstream OpenGL 2 branch of MapLibre Native

maplibre · Nov 21, 2023 · b0aaf63 · b0aaf63
1 parent 56d384c
commit b0aaf63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -111,7 +111,6 @@ target_link_libraries(
         Qt${QT_VERSION_MAJOR}::Network
     PRIVATE
         $<BUILD_INTERFACE:mbgl-compiler-options>
-        $<BUILD_INTERFACE:mbgl-core-interface>
         $<BUILD_INTERFACE:mbgl-core>
         $<BUILD_INTERFACE:CompilerOptions>
 )
@@ -122,6 +121,13 @@ if(NOT MLN_QT_WITH_INTERNAL_SQLITE)
             Qt${QT_VERSION_MAJOR}::Sql
     )
 endif()
+foreach(target ${MLN_QT_VENDOR_LIBRARIES})
+    target_link_libraries(
+        Core
+            PRIVATE
+                $<BUILD_INTERFACE:${target}>
+    )
+endforeach()
 
 # Apple specifics
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

diff --git a/vendor/maplibre-native b/vendor/maplibre-native
+40 −46		.github/workflows/qt-ci.yml
+1 −0		.gitignore
+2 −8		platform/qt/CHANGELOG.md
+5 −39		platform/qt/README.md
+18 −14		platform/qt/qt.cmake
+56 −0		platform/qt/src/utils/renderer_backend.cpp
+38 −0		platform/qt/src/utils/renderer_backend.hpp
+44 −0		platform/qt/src/utils/renderer_observer.hpp
+40 −0		platform/qt/src/utils/scheduler.cpp
+38 −0		platform/qt/src/utils/scheduler.hpp