mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-21 11:31:07 +00:00
aedi: update freetype to 2.13.2
harfbuzz support has been disabled
This commit is contained in:
parent
d0dc8da084
commit
5d8c1732fc
2 changed files with 6 additions and 7 deletions
|
@ -116,8 +116,8 @@ class FreeTypeTarget(base.CMakeStaticDependencyTarget):
|
||||||
|
|
||||||
def prepare_source(self, state: BuildState):
|
def prepare_source(self, state: BuildState):
|
||||||
state.download_source(
|
state.download_source(
|
||||||
'https://downloads.sourceforge.net/project/freetype/freetype2/2.11.0/freetype-2.11.0.tar.xz',
|
'https://downloads.sourceforge.net/project/freetype/freetype2/2.13.2/freetype-2.13.2.tar.xz',
|
||||||
'8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7')
|
'12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d')
|
||||||
|
|
||||||
def post_build(self, state: BuildState):
|
def post_build(self, state: BuildState):
|
||||||
super().post_build(state)
|
super().post_build(state)
|
||||||
|
@ -127,8 +127,7 @@ class FreeTypeTarget(base.CMakeStaticDependencyTarget):
|
||||||
shutil.copy(state.patch_path / 'freetype-config', bin_path)
|
shutil.copy(state.patch_path / 'freetype-config', bin_path)
|
||||||
|
|
||||||
def update_linker_flags(line: str):
|
def update_linker_flags(line: str):
|
||||||
link_flags = '-lbrotlicommon -lbrotlidec -lbz2 -lfreetype -lharfbuzz -lpng16 -lz ' \
|
link_flags = '-lbz2 -lpng16 -lz'
|
||||||
'-lc++ -framework CoreFoundation -framework CoreGraphics -framework CoreText'
|
|
||||||
link_var = ' INTERFACE_LINK_LIBRARIES '
|
link_var = ' INTERFACE_LINK_LIBRARIES '
|
||||||
|
|
||||||
return f'{link_var}"{link_flags}"\n' if line.startswith(link_var) else line
|
return f'{link_var}"{link_flags}"\n' if line.startswith(link_var) else line
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (C) 2000-2021 by
|
# Copyright (C) 2000-2023 by
|
||||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# This file is part of the FreeType project, and may only be used, modified,
|
||||||
|
@ -41,11 +41,11 @@ else
|
||||||
includedir=${prefix}/include
|
includedir=${prefix}/include
|
||||||
libdir=${exec_prefix}/lib
|
libdir=${exec_prefix}/lib
|
||||||
|
|
||||||
version=24.0.18
|
version=26.1.20
|
||||||
|
|
||||||
cflags="-I${SYSROOT}$includedir/freetype2"
|
cflags="-I${SYSROOT}$includedir/freetype2"
|
||||||
dynamic_libs="-lfreetype"
|
dynamic_libs="-lfreetype"
|
||||||
static_libs="-lfreetype -lz -lbz2 -lpng16 -lharfbuzz -lc++ -framework CoreFoundation -framework CoreGraphics -framework CoreText -lbrotlidec -lbrotlicommon"
|
static_libs="-lfreetype -lz -lbz2 -lpng16"
|
||||||
if test "${SYSROOT}$libdir" != "/usr/lib" &&
|
if test "${SYSROOT}$libdir" != "/usr/lib" &&
|
||||||
test "${SYSROOT}$libdir" != "/usr/lib64" ; then
|
test "${SYSROOT}$libdir" != "/usr/lib64" ; then
|
||||||
libs_L="-L${SYSROOT}$libdir"
|
libs_L="-L${SYSROOT}$libdir"
|
||||||
|
|
Loading…
Reference in a new issue