Skip to content
Snippets Groups Projects
Commit 0ba67a8e authored by Clément Bœsch's avatar Clément Bœsch
Browse files

build: remove special freetype check

Since 52ccc4a0 was merged, it's pointless to keep our special version.
parent 0a0517bb
No related branches found
No related tags found
No related merge requests found
...@@ -1354,26 +1354,6 @@ require_pkg_config(){ ...@@ -1354,26 +1354,6 @@ require_pkg_config(){
use_pkg_config "$@" || die "ERROR: $pkg not found using pkg-config$pkg_config_fail_message" use_pkg_config "$@" || die "ERROR: $pkg not found using pkg-config$pkg_config_fail_message"
} }
require_libfreetype(){
log require_libfreetype "$@"
pkg="freetype2"
check_cmd $pkg_config --exists --print-errors $pkg \
|| die "ERROR: $pkg not found"
pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
{
echo "#include <ft2build.h>"
echo "#include FT_FREETYPE_H"
echo "long check_func(void) { return (long) FT_Init_FreeType; }"
echo "int main(void) { return 0; }"
} | check_ld "cc" $pkg_cflags $pkg_libs \
&& set_safe "${pkg}_cflags" $pkg_cflags \
&& set_safe "${pkg}_libs" $pkg_libs \
|| die "ERROR: $pkg not found"
add_cflags $(get_safe "${pkg}_cflags")
add_extralibs $(get_safe "${pkg}_libs")
}
hostcc_e(){ hostcc_e(){
eval printf '%s\\n' $HOSTCC_E eval printf '%s\\n' $HOSTCC_E
} }
...@@ -5780,7 +5760,7 @@ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_c ...@@ -5780,7 +5760,7 @@ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_c
enabled libflite && require libflite "flite/flite.h" flite_init $flite_libs enabled libflite && require libflite "flite/flite.h" flite_init $flite_libs
enabled fontconfig && enable libfontconfig enabled fontconfig && enable libfontconfig
enabled libfontconfig && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit enabled libfontconfig && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
enabled libfreetype && require_libfreetype enabled libfreetype && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
enabled libfribidi && require_pkg_config fribidi fribidi.h fribidi_version_info enabled libfribidi && require_pkg_config fribidi fribidi.h fribidi_version_info
enabled libgme && require libgme gme/gme.h gme_new_emu -lgme -lstdc++ enabled libgme && require libgme gme/gme.h gme_new_emu -lgme -lstdc++
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment