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

Use ';' as path separator on win32. 

This is what pkg-config does, and it is necessary because ':' is part of
path specification on win32.
pull/1/head
Michał Górny 2012-05-02 11:24:58 +02:00
parent 9e1260ac3d
commit 353ba1eafe
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg.c
View File

@ -27,6 +27,15 @@
#define PKG_CONFIG_EXT ".pc" #define PKG_CONFIG_EXT ".pc"
#define PKG_CONFIG_PATH_SZ (65535) #define PKG_CONFIG_PATH_SZ (65535)
#ifdef _WIN32
/* pkg-config uses ';' on win32 as ':' is part of path */
#define PKG_CONFIG_PATH_SEP_S ";"
#define PKG_CONFIG_PATH_SEP ';'
#else
#define PKG_CONFIG_PATH_SEP_S ":"
#define PKG_CONFIG_PATH_SEP ':'
#endif
static inline const char * static inline const char *
pkg_get_pkgconfig_path(void) pkg_get_pkgconfig_path(void)
{ {
@ -42,7 +51,7 @@ pkg_get_pkgconfig_path(void)
env_path = getenv("PKG_CONFIG_PATH"); env_path = getenv("PKG_CONFIG_PATH");
if (env_path != NULL) if (env_path != NULL)
{ {
strlcat(path, ":", sizeof path); strlcat(path, PKG_CONFIG_PATH_SEP_S, sizeof path);
strlcat(path, env_path, sizeof path); strlcat(path, env_path, sizeof path);
} }
@ -63,7 +72,7 @@ pkg_find(const char *name)
env_path = pkg_get_pkgconfig_path(); env_path = pkg_get_pkgconfig_path();
while (env_path[count] != '\0') while (env_path[count] != '\0')
{ {
if (env_path[count] && env_path[count] != ':') if (env_path[count] && env_path[count] != PKG_CONFIG_PATH_SEP)
{ {
path[pcount] = env_path[count]; path[pcount] = env_path[count];
pcount++; pcount++;