ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

pkg: use relative paths on windows (issue #17)

pull/29/head
William Pitcock 2012-07-02 03:41:08 +00:00
parent 4017810b7a
commit 3d0f67a7b3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg.c
View File

@ -26,6 +26,8 @@
#ifdef _WIN32 #ifdef _WIN32
# define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH" # define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH"
# undef PKG_DEFAULT_PATH
# define PKG_DEFAULT_PATH "../lib/pkgconfig:../share/pkgconfig"
#endif #endif
#define PKG_CONFIG_EXT ".pc" #define PKG_CONFIG_EXT ".pc"
@ -113,7 +115,10 @@ get_pkgconfig_path(void)
*p = '\0'; *p = '\0';
strlcpy(outbuf, namebuf, sizeof outbuf); strlcpy(outbuf, namebuf, sizeof outbuf);
strlcat(outbuf, "/lib/pkgconfig", sizeof outbuf); strlcat(outbuf, "../lib/pkgconfig", sizeof outbuf);
strlcat(outbuf, ":", sizeof outbuf);
strlcat(outbuf, namebuf, sizeof outbuf);
strlcat(outbuf, "../share/pkgconfig", sizeof outbuf);
return outbuf; return outbuf;
#endif #endif
@ -283,11 +288,11 @@ pkg_find_in_registry_key(HKEY hkey, const char *name, unsigned int flags)
while (RegEnumValue(key, i++, buf, &bufsize, NULL, NULL, NULL, NULL) while (RegEnumValue(key, i++, buf, &bufsize, NULL, NULL, NULL, NULL)
== ERROR_SUCCESS) == ERROR_SUCCESS)
{ {
BYTE pathbuf[PKG_CONFIG_PATH_SZ]; char pathbuf[PKG_CONFIG_PATH_SZ];
DWORD type; DWORD type;
DWORD pathbuflen = sizeof pathbuf; DWORD pathbuflen = sizeof pathbuf;
if (RegQueryValueEx(key, buf, NULL, &type, pathbuf, &pathbuflen) if (RegQueryValueEx(key, buf, NULL, &type, (LPBYTE) pathbuf, &pathbuflen)
== ERROR_SUCCESS && type == REG_SZ) == ERROR_SUCCESS && type == REG_SZ)
{ {
pkg = pkg_try_specific_path(pathbuf, name, flags); pkg = pkg_try_specific_path(pathbuf, name, flags);