summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-08-09 04:06:32 +0000
committerDavid Robillard <d@drobilla.net>2012-08-09 04:06:32 +0000
commit2b76b454da7a34828985f93bdf92e115a86630b6 (patch)
treed8fb01e6d6af3abf5ea80b7fd568430d2b37f520
parente8f41104c807804d2a8ca6fc14b0e826e70b248b (diff)
downloadlilv-2b76b454da7a34828985f93bdf92e115a86630b6.tar.gz
lilv-2b76b454da7a34828985f93bdf92e115a86630b6.tar.bz2
lilv-2b76b454da7a34828985f93bdf92e115a86630b6.zip
Fix Windows static build.
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@4637 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/world.c2
-rw-r--r--wscript3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/world.c b/src/world.c
index 96cb247..e5aeb31 100644
--- a/src/world.c
+++ b/src/world.c
@@ -705,7 +705,7 @@ lilv_world_load_plugin_classes(LilvWorld* world)
LilvPluginClass* pclass = lilv_plugin_class_new(
world, parent_node, class_node, (const char*)label);
if (pclass) {
- zix_tree_insert(world->plugin_classes, pclass, NULL);
+ zix_tree_insert((ZixTree*)world->plugin_classes, pclass, NULL);
}
}
sord_iter_free(classes);
diff --git a/wscript b/wscript
index 8681b15..cccdb4e 100644
--- a/wscript
+++ b/wscript
@@ -311,7 +311,8 @@ def build(bld):
if not bld.env.BUILD_SHARED or bld.env.STATIC_PROGS:
obj.use = 'liblilv_static'
if bld.env.STATIC_PROGS:
- obj.lib = ['m']
+ if not bld.env.MSVC_COMPILER:
+ obj.lib = ['m']
obj.env.SHLIB_MARKER = obj.env.STLIB_MARKER
obj.linkflags = ['-static', '-Wl,--start-group']