mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 19:17:10 +01:00
Merge pull request #1208 from zabulus/harfbuzz
Fix harbuzz build for arm
This commit is contained in:
commit
40d0fe7f27
15
ports/harfbuzz/0001-fix-uwp-build.patch
Normal file
15
ports/harfbuzz/0001-fix-uwp-build.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git "a/harfbuzz-1.4.6/src/hb-ft.cc" "b/harfbuzz-1.4.6/src/hb-ft.cc"
|
||||
index 48d6a0ef..f4ce6608 100644
|
||||
--- "a/harfbuzz-1.4.6/src/hb-ft.cc"
|
||||
+++ "b/harfbuzz-1.4.6/src/hb-ft.cc"
|
||||
@@ -31,6 +31,10 @@
|
||||
|
||||
#include "hb-ft.h"
|
||||
|
||||
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
||||
+#define generic GenericFromFreeTypeLibrary
|
||||
+#endif
|
||||
+
|
||||
#include "hb-font-private.hh"
|
||||
|
||||
#include "hb-cache-private.hh" // Maybe use in the future?
|
@ -1,4 +1,4 @@
|
||||
Source: harfbuzz
|
||||
Version: 1.4.6
|
||||
Version: 1.4.6-1
|
||||
Description: HarfBuzz OpenType text shaping engine
|
||||
Build-Depends: freetype, glib
|
||||
Build-Depends: freetype, glib [x86], glib [x64]
|
||||
|
@ -7,13 +7,26 @@ vcpkg_download_distfile(ARCHIVE
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/
|
||||
PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch"
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
||||
SET(HAVE_GLIB "OFF")
|
||||
SET(BUILTIN_UCDN "ON")
|
||||
else()
|
||||
SET(HAVE_GLIB "ON")
|
||||
SET(BUILTIN_UCDN "OFF")
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DHB_HAVE_FREETYPE=ON
|
||||
-DHB_HAVE_GLIB=ON
|
||||
-DHB_BUILTIN_UCDN=OFF
|
||||
-DHB_HAVE_GLIB=${HAVE_GLIB}
|
||||
-DHB_BUILTIN_UCDN=${BUILTIN_UCDN}
|
||||
OPTIONS_DEBUG
|
||||
-DSKIP_INSTALL_HEADERS=ON
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user