From e6fddf9823d46917a69aef6f638b90ed2022604c Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 12 Nov 2021 21:54:05 -0300 Subject: [PATCH] Flip freetype back to the old name on Windows to ease upgrading (at least on 32-bit builds) --- .ci/build.sh | 2 +- src/printer/prt_escp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index 7e3a58ab3..afaba3c2e 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -242,7 +242,7 @@ EOF [ "$arch" = "32" -a -d "/c/Program Files (x86)" ] && pf="/c/Program Files (x86)" # Archive freetype from local MSYS installation. - .ci/static2dll.sh -p freetype2 /$MSYSTEM/lib/libfreetype.a archive_tmp/libfreetype-6.dll + .ci/static2dll.sh -p freetype2 /$MSYSTEM/lib/libfreetype.a archive_tmp/libfreetype.dll # Archive Ghostscript DLL from local official distribution installation. for gs in "$pf"/gs/gs*.*.* diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c index 1cd3b8ebe..08b6cd58e 100644 --- a/src/printer/prt_escp.c +++ b/src/printer/prt_escp.c @@ -87,7 +87,7 @@ #ifdef _WIN32 -# define PATH_FREETYPE_DLL "libfreetype-6.dll" +# define PATH_FREETYPE_DLL "libfreetype.dll" #else # define PATH_FREETYPE_DLL "libfreetype.so.6" #endif