Skip to content

Commit e94cc54

Browse files
authored
Merge pull request #202 from Ghabry/png-no-framework
Apple systems: Disable libpng framework
2 parents b8d5a04 + bc7a2ba commit e94cc54

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ios/2_build_toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function build() {
6161
cd "$WORKSPACE"
6262

6363
install_lib_cmake $ZLIB_DIR $ZLIB_ARGS
64-
install_lib_cmake $LIBPNG_DIR $LIBPNG_ARGS
64+
install_lib_cmake $LIBPNG_DIR $LIBPNG_ARGS -DPNG_FRAMEWORK=OFF
6565
install_lib_cmake $FREETYPE_DIR $FREETYPE_ARGS -DFT_DISABLE_HARFBUZZ=ON
6666
install_lib_meson $HARFBUZZ_DIR $HARFBUZZ_ARGS
6767
install_lib_cmake $FREETYPE_DIR $FREETYPE_ARGS -DFT_DISABLE_HARFBUZZ=OFF

macos/2_build_toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function build() {
6161
cd "$WORKSPACE"
6262

6363
install_lib_cmake $ZLIB_DIR $ZLIB_ARGS
64-
install_lib_cmake $LIBPNG_DIR $LIBPNG_ARGS
64+
install_lib_cmake $LIBPNG_DIR $LIBPNG_ARGS -DPNG_FRAMEWORK=OFF
6565
install_lib_cmake $FREETYPE_DIR $FREETYPE_ARGS -DFT_DISABLE_HARFBUZZ=ON
6666
install_lib_meson $HARFBUZZ_DIR $HARFBUZZ_ARGS
6767
install_lib_cmake $FREETYPE_DIR $FREETYPE_ARGS -DFT_DISABLE_HARFBUZZ=OFF

tvos/2_build_toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function build() {
6161
cd "$WORKSPACE"
6262

6363
install_lib_cmake $ZLIB_DIR $ZLIB_ARGS
64-
install_lib_cmake $LIBPNG_DIR $LIBPNG_ARGS
64+
install_lib_cmake $LIBPNG_DIR $LIBPNG_ARGS -DPNG_FRAMEWORK=OFF
6565
install_lib_cmake $FREETYPE_DIR $FREETYPE_ARGS -DFT_DISABLE_HARFBUZZ=ON
6666
install_lib_meson $HARFBUZZ_DIR $HARFBUZZ_ARGS
6767
install_lib_cmake $FREETYPE_DIR $FREETYPE_ARGS -DFT_DISABLE_HARFBUZZ=OFF

0 commit comments

Comments
 (0)