Commit 03637c20e2cd8f68b989741cb0d424ba9065817a
2022-05-13T10:09:24
fix libs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/lib/glfw3/configure b/lib/glfw3/configure
index 21edc40..8b534e1 100755
--- a/lib/glfw3/configure
+++ b/lib/glfw3/configure
@@ -22,11 +22,12 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
-LIBS="$(pkg-config --libs glfw3)"
-if test "$(uname -s)" = "Darwin"; then
- LIBS="$LIBS -framework OpenGL"
-fi
-LIBS="$LIBS ../../librtbuf/librtbuf.la ../librtbuf_music.la ../librtbuf_signal.la"
+LIBS=""
+LIBS="$LIBS $(pkg-config --libs glfw3)"
+LIBS="$LIBS $(pkg-config --libs gl)"
+LIBS="$LIBS ../librtbuf_music.la"
+LIBS="$LIBS ../librtbuf_signal.la"
+LIBS="$LIBS ../../librtbuf/librtbuf.la"
echo "LIBS = $LIBS" >> ${CONFIG_MK}
rtbuf_library glfw3
diff --git a/lib/portaudio/input.c b/lib/portaudio/input.c
index cd94689..018b3ad 100644
--- a/lib/portaudio/input.c
+++ b/lib/portaudio/input.c
@@ -44,7 +44,8 @@ int rtbuf_portaudio_input_start (s_rtbuf *rtb)
s_rtbuf_portaudio_input_data *data;
if (rtb->proc->out_bytes < sizeof(*data))
return 1;
- /* data = (s_rtbuf_portaudio_input_data*) rtb->data; */
+ data = (s_rtbuf_portaudio_input_data*) rtb->data;
+ (void) data;
return 0;
}
diff --git a/lib/sndio/input.c b/lib/sndio/input.c
index 91b2d29..401b8fc 100644
--- a/lib/sndio/input.c
+++ b/lib/sndio/input.c
@@ -42,8 +42,10 @@ int rtbuf_sndio_input (s_rtbuf *rtb)
int rtbuf_sndio_input_start (s_rtbuf *rtb)
{
s_rtbuf_sndio_input_data *data;
- assert(rtb->proc->out_bytes == sizeof(*data));
+ if (rtb->proc->out_bytes != sizeof(*data))
+ return 1;
data = (s_rtbuf_sndio_input_data*) rtb->data;
+ (void) data;
return 0;
}
diff --git a/lib/synth/configure b/lib/synth/configure
index 2f1d9f5..dd34937 100755
--- a/lib/synth/configure
+++ b/lib/synth/configure
@@ -22,7 +22,10 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
LDFLAGS=""
echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
-LIBS="../../librtbuf/librtbuf.la ../librtbuf_music.la ../librtbuf_signal.la"
+LIBS=""
+LIBS="$LIBS ../librtbuf_music.la"
+LIBS="$LIBS ../librtbuf_signal.la"
+LIBS="$LIBS ../../librtbuf/librtbuf.la"
echo "LIBS = $LIBS" >> ${CONFIG_MK}
rtbuf_library synth
diff --git a/lib/synth/synth.c b/lib/synth/synth.c
index bcd6220..af3d8a8 100644
--- a/lib/synth/synth.c
+++ b/lib/synth/synth.c
@@ -258,7 +258,8 @@ int rtbuf_synth_synth_start (s_rtbuf *rtb)
s_rtbuf_synth_synth_data *data;
if (rtb->proc->out_bytes < sizeof(*data))
return 1;
- /* data = (s_rtbuf_synth_synth_data*) rtb->data; */
+ data = (s_rtbuf_synth_synth_data*) rtb->data;
+ (void) data;
return 0;
}