summaryrefslogtreecommitdiffstats
path: root/src/daemon/daemon-conf.c
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2011-03-20 11:18:19 +0000
committerColin Guthrie <cguthrie@mandriva.org>2011-03-20 11:18:19 +0000
commitd7ce59de88eda4eb638f977975374359254731f7 (patch)
tree5baf1627cef783c15b3d339f0d242dcf2a47788c /src/daemon/daemon-conf.c
parentf7acd4bdab7092700a9386802a0ec86d4362e58c (diff)
parentf99b17b825ea7dbf4c2e9ecd490d9b6b54018df3 (diff)
Merge remote-tracking branch 'mkbosmans/mingw32-build'
Diffstat (limited to 'src/daemon/daemon-conf.c')
-rw-r--r--src/daemon/daemon-conf.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index ce93dbc6..9b530a80 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -160,7 +160,21 @@ pa_daemon_conf* pa_daemon_conf_new(void) {
} else
#endif
+#ifdef OS_IS_WIN32
+ {
+ char *t;
+ char *majorminor = pa_xstrdup(VERSION);
+ char *toplevel = pa_win32_get_toplevel(NULL);
+
+ if ((t = strchr(majorminor, '-')))
+ *t = '\0';
+
+ c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%s" PA_PATH_SEP "modules", toplevel, majorminor);
+ pa_xfree(majorminor);
+ }
+#else
c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH);
+#endif
return c;
}