walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get the DLL from "bin" where modern libtools put it, not "lib". 

Check also drive letter prefix on Win32.
This commit is contained in:
Tor Lillqvist 2005-03-09 00:47:11 +00:00
parent d49dde9f90
commit 79da4fe91f
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-03-09 Tor Lillqvist <tml@novell.com>
* fontconfig-zip.in: Get the DLL from "bin" where modern libtools
put it, not "lib".
* src/fccfg.c (FcConfigFileExists): Check also drive letter
prefix on Win32.
2005-03-08 Keith Packard <keithp@keithp.com> 2005-03-08 Keith Packard <keithp@keithp.com>
* README: * README:

2
fontconfig-zip.in
View File

@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip
cd @prefix@ cd @prefix@
rm -f $ZIP rm -f $ZIP
zip $ZIP -@ <<EOF zip $ZIP -@ <<EOF
lib/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll bin/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll
etc/fonts/fonts.conf etc/fonts/fonts.conf
EOF EOF

4
src/fccfg.c
View File

@ -1503,7 +1503,9 @@ FcConfigFileExists (const FcChar8 *dir, const FcChar8 *file)
#ifdef _WIN32 #ifdef _WIN32
if ((!path[0] || (path[strlen((char *) path)-1] != '/' && if ((!path[0] || (path[strlen((char *) path)-1] != '/' &&
path[strlen((char *) path)-1] != '\\')) && path[strlen((char *) path)-1] != '\\')) &&
(file[0] != '/' && file[0] != '\\')) !(file[0] == '/' ||
file[0] == '\\' ||
(isalpha (file[0]) && file[1] == ':' && (file[2] == '/' || file[2] == '\\'))))
strcat ((char *) path, "\\"); strcat ((char *) path, "\\");
#else #else
if ((!path[0] || path[strlen((char *) path)-1] != '/') && file[0] != '/') if ((!path[0] || path[strlen((char *) path)-1] != '/') && file[0] != '/')