@@ -1,26 +0,0 @@ | |||||
diff --git a/src/wavedata.c b/src/wavedata.c | |||||
index 910577f..a926596 100644 | |||||
--- a/src/wavedata.c | |||||
+++ b/src/wavedata.c | |||||
@@ -28,7 +28,7 @@ | |||||
# include <windows.h> | |||||
# define dlopen(path, flags) LoadLibrary(path) | |||||
# define dlclose(lib) FreeLibrary((HMODULE)lib) | |||||
-# define dlsym(lib, sym) GetProcAddress((HMODULE)lib, sym) | |||||
+# define dlfunc(lib, sym) GetProcAddress((HMODULE)lib, sym) | |||||
# define snprintf _snprintf | |||||
#else | |||||
# include <dlfcn.h> | |||||
@@ -55,10 +55,12 @@ wavedata_load(Wavedata* w, | |||||
free(lib_path); | |||||
if (handle) { | |||||
+#ifndef _WIN32 | |||||
// Avoid pedantic warnings about fetching functions with dlsym | |||||
typedef void (*VoidFunc)(void); | |||||
typedef VoidFunc (*VoidFuncGetter)(void*, const char*); | |||||
VoidFuncGetter dlfunc = (VoidFuncGetter)dlsym; | |||||
+#endif | |||||
typedef int (*DescFunc)(Wavedata*, unsigned long); | |||||
DescFunc desc_func = (DescFunc)dlfunc(handle, wdat_descriptor_name); |
@@ -1,13 +1,16 @@ | |||||
diff --git a/wscript b/wscript | diff --git a/wscript b/wscript | ||||
index 2b69029..8784ac2 100644 | |||||
index a5bfd28..2421a3b 100644 | |||||
--- a/wscript | --- a/wscript | ||||
+++ b/wscript | +++ b/wscript | ||||
@@ -160,7 +160,7 @@ def build(bld): | |||||
@@ -170,10 +170,7 @@ def build(bld): | |||||
# Waveform data source | # Waveform data source | ||||
for i in ['parabola', 'sawtooth', 'square']: | for i in ['parabola', 'sawtooth', 'square']: | ||||
- bld(rule = '${SRC} -r %d -f 12 -s 1 -m 128 -g 1.0 -w %s -p %s -o ${TGT}' % ( | |||||
+ bld(rule = 'wine ${SRC} -r %d -f 12 -s 1 -m 128 -g 1.0 -w %s -p %s -o ${TGT}' % ( | |||||
Options.options.rate, i, i), | |||||
- cmd = '${SRC} -r %d -f 12 -s 1 -m 128 -g 1.0 -w %s -p %s -o ${TGT}' | |||||
- if Options.options.test_wrapper: | |||||
- cmd = Options.options.test_wrapper + ' ' + cmd | |||||
- | |||||
+ cmd = 'wine ${SRC} -r %d -f 12 -s 1 -m 128 -g 1.0 -w %s -p %s -o ${TGT}' | |||||
bld(rule = cmd % (Options.options.rate, i, i), | |||||
source = wavegen.link_task.outputs[0], | source = wavegen.link_task.outputs[0], | ||||
target = 'src/%s_data.c' % i, | target = 'src/%s_data.c' % i, |
@@ -0,0 +1 @@ | |||||
win32 |
@@ -1,13 +0,0 @@ | |||||
diff --git a/wscript b/wscript | |||||
index 2b69029..8784ac2 100644 | |||||
--- a/wscript | |||||
+++ b/wscript | |||||
@@ -160,7 +160,7 @@ def build(bld): | |||||
# Waveform data source | |||||
for i in ['parabola', 'sawtooth', 'square']: | |||||
- bld(rule = '${SRC} -r %d -f 12 -s 1 -m 128 -g 1.0 -w %s -p %s -o ${TGT}' % ( | |||||
+ bld(rule = 'wine ${SRC} -r %d -f 12 -s 1 -m 128 -g 1.0 -w %s -p %s -o ${TGT}' % ( | |||||
Options.options.rate, i, i), | |||||
source = wavegen.link_task.outputs[0], | |||||
target = 'src/%s_data.c' % i, |
@@ -1,8 +1,8 @@ | |||||
{ | { | ||||
"name": "blop-lv2", | "name": "blop-lv2", | ||||
"lv2bundles": ["blop.lv2"], | "lv2bundles": ["blop.lv2"], | ||||
"version": "e76724d58c39a52e3f47dbff40c011c54d9a0fdb", | |||||
"dlbaseurl": "http://git.drobilla.net/blop.lv2.git", | |||||
"version": "1dd27f8e78e325b4688cd022343a18453fb9c8f1", | |||||
"dlbaseurl": "https://gitlab.com/drobilla/blop-lv2.git", | |||||
"dlmethod": "git", | "dlmethod": "git", | ||||
"buildtype": "waf", | "buildtype": "waf", | ||||
"buildargs": "--lv2dir=lib/lv2" | "buildargs": "--lv2dir=lib/lv2" | ||||