diff --git a/docs/mdbook/src/platforms/windows/build-msvc-arm64.md b/docs/mdbook/src/platforms/windows/build-msvc-arm64.md index 2a204468d..c6c5acbf1 100644 --- a/docs/mdbook/src/platforms/windows/build-msvc-arm64.md +++ b/docs/mdbook/src/platforms/windows/build-msvc-arm64.md @@ -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 diff --git a/docs/mdbook/src/platforms/windows/build-msys2.md b/docs/mdbook/src/platforms/windows/build-msys2.md index 3a559bd69..7471c22cd 100644 --- a/docs/mdbook/src/platforms/windows/build-msys2.md +++ b/docs/mdbook/src/platforms/windows/build-msys2.md @@ -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 \ diff --git a/platform/default/src/mbgl/storage/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp index 4f95137ce..24be9fafc 100644 --- a/platform/default/src/mbgl/storage/http_file_source.cpp +++ b/platform/default/src/mbgl/storage/http_file_source.cpp @@ -15,7 +15,6 @@ #include -#include #include #include #include diff --git a/platform/windows/Get-VendorPackages.ps1 b/platform/windows/Get-VendorPackages.ps1 index 5874a32f1..a33328e91 100644 --- a/platform/windows/Get-VendorPackages.ps1 +++ b/platform/windows/Get-VendorPackages.ps1 @@ -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 {@()}) ) diff --git a/platform/windows/windows.cmake b/platform/windows/windows.cmake index 0473e0114..54f5096e2 100644 --- a/platform/windows/windows.cmake +++ b/platform/windows/windows.cmake @@ -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(