Skip to content

Commit a99b6be

Browse files
committed
Remove freetype useless lib suggestions
1 parent 864678a commit a99b6be

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

config/lib.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@
143143
"zlib"
144144
],
145145
"lib-suggests": [
146-
"libpng",
147-
"bzip2",
148-
"brotli"
146+
"libpng"
149147
]
150148
},
151149
"gettext": {

src/SPC/builder/unix/library/freetype.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ protected function build(): void
1313
{
1414
$cmake = UnixCMakeExecutor::create($this)
1515
->optionalLib('libpng', ...cmake_boolean_args('FT_DISABLE_PNG', true))
16-
->optionalLib('bzip2', ...cmake_boolean_args('FT_DISABLE_BZIP2', true))
17-
->optionalLib('brotli', ...cmake_boolean_args('FT_DISABLE_BROTLI', true))
16+
->addConfigureArgs('-DFT_DISABLE_BZIP2=ON')
17+
->addConfigureArgs('-DFT_DISABLE_BROTLI=ON')
1818
->addConfigureArgs('-DFT_DISABLE_HARFBUZZ=ON');
1919

2020
// fix cmake 4.0 compatibility

src/SPC/builder/windows/library/freetype.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ protected function build(): void
2424
"-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
2525
'-DCMAKE_BUILD_TYPE=Release ' .
2626
'-DBUILD_SHARED_LIBS=OFF ' .
27+
'-DFT_DISABLE_BROTLI=TRUE ' .
28+
'-DFT_DISABLE_BZIP2=TRUE ' .
2729
'-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
2830
)
2931
->execWithWrapper(

0 commit comments

Comments
 (0)