summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-03-28 04:35:25 +0000
committerDavid Robillard <d@drobilla.net>2011-03-28 04:35:25 +0000
commite53fd177f853d6bf26d2a3a3411dd243fe1ad828 (patch)
tree2d3b4abf9633036b38d2121bb167a149c40d0476
parent799264dcf2ced28bb8d2bdb25dcc084887a6c9da (diff)
downloadlilv-e53fd177f853d6bf26d2a3a3411dd243fe1ad828.tar.gz
lilv-e53fd177f853d6bf26d2a3a3411dd243fe1ad828.tar.bz2
lilv-e53fd177f853d6bf26d2a3a3411dd243fe1ad828.zip
Implement variable expansion on Windows and use standard LV2_PATH
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@3132 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/world.c4
-rw-r--r--wscript2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/world.c b/src/world.c
index 39262e6..5493cba 100644
--- a/src/world.c
+++ b/src/world.c
@@ -514,6 +514,10 @@ expand(const char* path)
}
wordfree(&p);
+#elif defined(__WIN32__)
+ static const size_t len = 32767;
+ char* ret = malloc(len);
+ ExpandEnvironmentStrings(path, ret, len);
#else
char* ret = slv2_strdup(path);
#endif
diff --git a/wscript b/wscript
index a39eeb9..e3678c2 100644
--- a/wscript
+++ b/wscript
@@ -133,7 +133,7 @@ def configure(conf):
'~/.lv2',
'/boot/common/add-ons/lv2'])
elif Options.platform == 'win32':
- Options.options.default_lv2_path = 'C:\\\\Program Files\\\\LV2'
+ Options.options.default_lv2_path = '%APPDATA%\\\\LV2;%PROGRAMFILES%\\\\LV2'
else:
libdirname = os.path.basename(conf.env['LIBDIR'])
Options.options.default_lv2_path = slv2_path_sep.join([