Changeset 3905

Timestamp:

2011-12-27 08:01:41 (17 months ago)

Author:

drobilla

Message:

Fix compilation.

Location:

trunk/plugins/blip.lv2

Files:

• src/include/interpolate.h (modified) (1 diff)
• src/include/math_func.h (modified) (1 diff)
• src/include/wavedata.h (modified) (1 diff)
• src/sum.c (modified) (1 diff)
• src/wavedata.c (modified) (1 diff)
• src/wavegen.c (modified) (1 diff)
• src/wdatutil.c (modified) (2 diffs)
• wscript (modified) (2 diffs)

trunk/plugins/blip.lv2/src/include/interpolate.h

@@ -3 +3 @@
 
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include <config.h>
+#include "blip-config.h"
 #include "math_func.h"
 

trunk/plugins/blip.lv2/src/include/math_func.h

@@ -8 +8 @@
 
 #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

trunk/plugins/blip.lv2/src/include/wavedata.h

@@ -22 +22 @@
 
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include <config.h>
+#include "blip-config.h"
 #include "math_func.h"
 #include "interpolate.h"

trunk/plugins/blip.lv2/src/sum.c

@@ -20 +20 @@
 #include <stdlib.h>
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "include/lv2_features.h"
 
 #define SUM_INPUT1 0

trunk/plugins/blip.lv2/src/wavedata.c

@@ -26 +26 @@
 #include <stdio.h>
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "config.h"
+#include "blip-config.h"
 #include "wavedata.h"
 

trunk/plugins/blip.lv2/src/wavegen.c

@@ -133 +133 @@
                 strcmplen = len1 < len2 ? len1 : len2;
 
-                if (!strncasecmp(optarg, wave_names[i], strcmplen)) {
+                if (!strncmp(optarg, wave_names[i], strcmplen)) {
                     wavetype = i;
                 }

trunk/plugins/blip.lv2/src/wdatutil.c

@@ -21 +21 @@
 #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"
@@ -51 +51 @@
 
 char* wave_names[] = {
-    "Saw",
-    "Square",
-    "Parabola"
+    "saw",
+    "square",
+    "parabola"
 };
 

trunk/plugins/blip.lv2/wscript

@@ -25 +25 @@
     autowaf.display_header('Blip Configuration')
 
+    conf.env.append_unique('CFLAGS', '-std=c99')
+
     autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE')
 
@@ -33 +35 @@
                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']