diff options
| -rw-r--r-- | src/include/interpolate.h | 2 | ||||
| -rw-r--r-- | src/include/math_func.h | 14 | ||||
| -rw-r--r-- | src/include/wavedata.h | 2 | ||||
| -rw-r--r-- | src/sum.c | 1 | ||||
| -rw-r--r-- | src/wavedata.c | 2 | ||||
| -rw-r--r-- | src/wavegen.c | 2 | ||||
| -rw-r--r-- | src/wdatutil.c | 8 | ||||
| -rw-r--r-- | wscript | 6 |
8 files changed, 24 insertions, 13 deletions
diff --git a/src/include/interpolate.h b/src/include/interpolate.h index d61fb3e..40ae62c 100644 --- a/src/include/interpolate.h +++ b/src/include/interpolate.h @@ -2,7 +2,7 @@ #define blip_interpolate_h #include "lv2/lv2plug.in/ns/lv2core/lv2.h" -#include <config.h> +#include "blip-config.h" #include "math_func.h" /** diff --git a/src/include/math_func.h b/src/include/math_func.h index c44075d..b3bbe7b 100644 --- a/src/include/math_func.h +++ b/src/include/math_func.h @@ -7,7 +7,19 @@ #define math_func_h #include <math.h> -#include "config.h" +#include "blip-config.h" + +#ifndef M_PI +# define M_PI 3.14159265358979323846 /* pi */ +#endif + +#ifndef M_LN10 +# define M_LN10 2.30258509299404568402 /* log_e(10) */ +#endif + +#ifndef M_LN2 +# define M_LN2 0.69314718055994530942 /* log_e(2) */ +#endif #ifdef HAVE_SINF /* Use float functions */ diff --git a/src/include/wavedata.h b/src/include/wavedata.h index 32a8a5b..cc3e3b6 100644 --- a/src/include/wavedata.h +++ b/src/include/wavedata.h @@ -21,7 +21,7 @@ #define blip_wavedata_h #include "lv2/lv2plug.in/ns/lv2core/lv2.h" -#include <config.h> +#include "blip-config.h" #include "math_func.h" #include "interpolate.h" #include "common.h" @@ -19,7 +19,6 @@ #include <stdlib.h> #include "lv2/lv2plug.in/ns/lv2core/lv2.h" -#include "include/lv2_features.h" #define SUM_INPUT1 0 #define SUM_INPUT2 1 diff --git a/src/wavedata.c b/src/wavedata.c index 7bf8e3b..de6b0d8 100644 --- a/src/wavedata.c +++ b/src/wavedata.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <stdio.h> #include "lv2/lv2plug.in/ns/lv2core/lv2.h" -#include "config.h" +#include "blip-config.h" #include "wavedata.h" int diff --git a/src/wavegen.c b/src/wavegen.c index c1a2137..3ba0452 100644 --- a/src/wavegen.c +++ b/src/wavegen.c @@ -132,7 +132,7 @@ main(int argc, len2 = strlen(wave_names[i]); strcmplen = len1 < len2 ? len1 : len2; - if (!strncasecmp(optarg, wave_names[i], strcmplen)) { + if (!strncmp(optarg, wave_names[i], strcmplen)) { wavetype = i; } } diff --git a/src/wdatutil.c b/src/wdatutil.c index b6a9409..f7a277d 100644 --- a/src/wdatutil.c +++ b/src/wdatutil.c @@ -20,9 +20,9 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> #include "lv2/lv2plug.in/ns/lv2core/lv2.h" #include "common.h" +#include "math_func.h" #include "wavedata.h" #include "wdatutil.h" @@ -50,9 +50,9 @@ void generate_parabola(float* samples, #endif char* wave_names[] = { - "Saw", - "Square", - "Parabola" + "saw", + "square", + "parabola" }; char* wave_descriptions[] = { @@ -24,6 +24,8 @@ def configure(conf): autowaf.configure(conf) autowaf.display_header('Blip Configuration') + conf.env.append_unique('CFLAGS', '-std=c99') + autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE') conf.check(function_name = 'sinf', @@ -32,9 +34,7 @@ def configure(conf): define_name = 'HAVE_SINF', mandatory = False) - conf.env.append_unique('CFLAGS', '-std=c99') - - conf.write_config_header('config.h', remove=False) + conf.write_config_header('blip-config.h', remove=False) # Set env['pluginlib_PATTERN'] pat = conf.env['cshlib_PATTERN'] |