Flip freetype back to the old name on Windows to ease upgrading (at least on 32-bit builds)
This commit is contained in:
@@ -242,7 +242,7 @@ EOF
|
|||||||
[ "$arch" = "32" -a -d "/c/Program Files (x86)" ] && pf="/c/Program Files (x86)"
|
[ "$arch" = "32" -a -d "/c/Program Files (x86)" ] && pf="/c/Program Files (x86)"
|
||||||
|
|
||||||
# Archive freetype from local MSYS installation.
|
# 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.
|
# Archive Ghostscript DLL from local official distribution installation.
|
||||||
for gs in "$pf"/gs/gs*.*.*
|
for gs in "$pf"/gs/gs*.*.*
|
||||||
|
@@ -87,7 +87,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# define PATH_FREETYPE_DLL "libfreetype-6.dll"
|
# define PATH_FREETYPE_DLL "libfreetype.dll"
|
||||||
#else
|
#else
|
||||||
# define PATH_FREETYPE_DLL "libfreetype.so.6"
|
# define PATH_FREETYPE_DLL "libfreetype.so.6"
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user