From f651b7bfb033ac0b3dd8313a7d1781d84e8ecbdd Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Mon, 4 Nov 2024 16:04:59 +0100 Subject: [WRAPPER] forgot to handle libfontconfig also --- src/library_list.h | 1 + src/wrapped/wrappedfontconfig.c | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/library_list.h b/src/library_list.h index 22fb947f..30f8efff 100644 --- a/src/library_list.h +++ b/src/library_list.h @@ -162,6 +162,7 @@ GO("libpango-1.0.so", pango) //GO("libnm-util.so.2", libnm) GO("libibus-1.0.so.5", libibus) GO("libfontconfig.so.1", fontconfig) +GO("libfontconfig.so", fontconfig) GO("libharfbuzz.so.0", libharfbuzz) GO("libbz2.so.1", bz2) GO("liblzma.so.5", lzma) diff --git a/src/wrapped/wrappedfontconfig.c b/src/wrapped/wrappedfontconfig.c index 246f5e92..25d05e56 100644 --- a/src/wrapped/wrappedfontconfig.c +++ b/src/wrapped/wrappedfontconfig.c @@ -18,11 +18,8 @@ #include "emu/x64emu_private.h" #include "myalign.h" -#ifdef ANDROID - const char* fontconfigName = "libfontconfig.so"; -#else - const char* fontconfigName = "libfontconfig.so.1"; -#endif +const char* fontconfigName = "libfontconfig.so.1"; +#define ALTNAME "libfontconfig.so" #define LIBNAME fontconfig @@ -66,10 +63,6 @@ EXPORT void* my_FcPatternBuild(x64emu_t* emu, void* pattern, uint64_t* b) return my->FcPatternVaBuild(pattern, VARARGS); } -#ifdef ANDROID -#define NEEDED_LIBS "libexpat.so", "libfreetype.so" -#else #define NEEDED_LIBS "libexpat.so.1", "libfreetype.so.6" -#endif #include "wrappedlib_init.h" -- cgit 1.4.1