core: Remove dlfcn dependency on Windows (#4347)

This commit is contained in:
Sargun Vohra
2026-07-01 05:49:23 -07:00
committed by GitHub
parent 027b9340c3
commit 58d76e1617
5 changed files with 1 additions and 8 deletions

View File

@@ -48,7 +48,6 @@ if (!(Test-Path platform\windows\vendor\vcpkg\vcpkg.exe)) {
.\platform\windows\vendor\vcpkg\vcpkg.exe install libuv:arm64-windows
.\platform\windows\vendor\vcpkg\vcpkg.exe install icu:arm64-windows
.\platform\windows\vendor\vcpkg\vcpkg.exe install glfw3:arm64-windows
.\platform\windows\vendor\vcpkg\vcpkg.exe install dlfcn-win32:arm64-windows
.\platform\windows\vendor\vcpkg\vcpkg.exe install zlib:arm64-windows
.\platform\windows\vendor\vcpkg\vcpkg.exe install egl-registry:arm64-windows
.\platform\windows\vendor\vcpkg\vcpkg.exe install opengl-registry:arm64-windows

View File

@@ -14,7 +14,6 @@ pacman -S --needed \
${MINGW_PACKAGE_PREFIX}-cmake \
${MINGW_PACKAGE_PREFIX}-angleproject \
${MINGW_PACKAGE_PREFIX}-curl-winssl \
${MINGW_PACKAGE_PREFIX}-dlfcn \
${MINGW_PACKAGE_PREFIX}-glfw \
${MINGW_PACKAGE_PREFIX}-icu \
${MINGW_PACKAGE_PREFIX}-libjpeg-turbo \

View File

@@ -15,7 +15,6 @@
#include <curl/curl.h>
#include <dlfcn.h>
#include <queue>
#include <cassert>
#include <cstring>

View File

@@ -39,7 +39,7 @@ if(-not (Test-Path ('{0}\vcpkg.exe' -f $vcpkg_temp_dir)))
('--overlay-triplets={0}' -f [System.IO.Path]::Combine($PWD.Path, 'vendor', 'vcpkg-custom-triplets')),
('--triplet={0}' -f $Triplet),
'--clean-after-build',
'install', 'curl', 'dlfcn-win32', 'glfw3', 'libuv', 'libjpeg-turbo', 'libpng', 'libwebp'
'install', 'curl', 'glfw3', 'libuv', 'libjpeg-turbo', 'libpng', 'libwebp'
) + $renderer_packages + $(if(${With-ICU}) {@('icu')} else {@()})
)

View File

@@ -23,13 +23,11 @@ if(MSVC)
)
find_package(CURL REQUIRED)
find_package(dlfcn-win32 REQUIRED)
find_package(ICU OPTIONAL_COMPONENTS i18n uc)
find_package(JPEG REQUIRED)
find_package(libuv REQUIRED)
find_package(PNG REQUIRED)
find_package(WebP REQUIRED)
find_path(DLFCN_INCLUDE_DIRS dlfcn.h)
find_path(LIBUV_INCLUDE_DIRS uv.h)
elseif(DEFINED ENV{MSYSTEM})
set(MSYS 1)
@@ -187,7 +185,6 @@ target_include_directories(
PRIVATE
${PROJECT_SOURCE_DIR}/platform/windows/include
${CURL_INCLUDE_DIRS}
${DLFCN_INCLUDE_DIRS}
${JPEG_INCLUDE_DIRS}
${LIBUV_INCLUDE_DIRS}
${WEBP_INCLUDE_DIRS}
@@ -234,7 +231,6 @@ if(MSVC)
mbgl-core
PRIVATE
${CURL_LIBRARIES}
dlfcn-win32::dl
)
elseif(MSYS)
target_link_libraries(