mirror of https://github.com/microsoft/vcpkg.git
[harfbuzz] Fix missing link library user32.lib (#43760)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
parent
43b747a8e9
commit
0ca2f9bebb
|
|
@ -0,0 +1,37 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c8e377db6..eb38f45ba 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -340,15 +340,15 @@ endif ()
|
||||
if (WIN32 AND HB_HAVE_GDI)
|
||||
add_definitions(-DHAVE_GDI)
|
||||
list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-gdi.h)
|
||||
- list(APPEND THIRD_PARTY_LIBS gdi32)
|
||||
- list(APPEND PC_LIBS_PRIV -lgdi32)
|
||||
+ list(APPEND THIRD_PARTY_LIBS gdi32 user32)
|
||||
+ list(APPEND PC_LIBS_PRIV -lgdi32 -luser32)
|
||||
endif ()
|
||||
|
||||
if (WIN32 AND HB_HAVE_UNISCRIBE)
|
||||
add_definitions(-DHAVE_UNISCRIBE)
|
||||
list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-uniscribe.h)
|
||||
- list(APPEND THIRD_PARTY_LIBS usp10 gdi32 rpcrt4)
|
||||
- list(APPEND PC_LIBS_PRIV -lusp10 -lgdi32 -lrpcrt4)
|
||||
+ list(APPEND THIRD_PARTY_LIBS usp10 gdi32 rpcrt4 user32)
|
||||
+ list(APPEND PC_LIBS_PRIV -lusp10 -lgdi32 -lrpcrt4 -luser32)
|
||||
endif ()
|
||||
|
||||
if (WIN32 AND HB_HAVE_DIRECTWRITE)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 5a02b3bb2..00a8c5ec8 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -321,7 +321,7 @@ if host_machine.system() == 'windows' and not get_option('gdi').disabled()
|
||||
endif
|
||||
|
||||
gdi_deps_found = true
|
||||
- foreach usplib : ['usp10', 'gdi32', 'rpcrt4']
|
||||
+ foreach usplib : ['usp10', 'gdi32', 'rpcrt4', 'user32']
|
||||
dep = cpp.find_library(usplib, required: get_option('gdi'))
|
||||
gdi_deps_found = gdi_deps_found and dep.found()
|
||||
gdi_uniscribe_deps += dep
|
||||
|
|
@ -6,6 +6,7 @@ vcpkg_from_github(
|
|||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-win32-build.patch
|
||||
fix-build-ffmpeg-failed.patch
|
||||
)
|
||||
|
||||
if("icu" IN_LIST FEATURES)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "harfbuzz",
|
||||
"version": "10.2.0",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "HarfBuzz OpenType text shaping engine",
|
||||
"homepage": "https://github.com/harfbuzz/harfbuzz",
|
||||
"license": "MIT-Modern-Variant",
|
||||
|
|
|
|||
|
|
@ -3442,7 +3442,7 @@
|
|||
},
|
||||
"harfbuzz": {
|
||||
"baseline": "10.2.0",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"hash-library": {
|
||||
"baseline": "8",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e877500fd52227ef36b3137d281f6fb313770b3d",
|
||||
"version": "10.2.0",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "dca5663a0e2943d17c1bc0a308ce820613854084",
|
||||
"version": "10.2.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue