jkramer / shell-fm fork watch download tarball
public
Description: Lightweight console-based radio player for Last.FM radio streams.
Homepage: http://nex.scrapping.cc/code/shell-fm/
Clone URL: git://github.com/jkramer/shell-fm.git
Search Repo: 
Fix building on FreeBSD.

FreeBSD installs libmad in /usr/local, so we need to get the CFLAGS from
pkg-config. Also, FreeBSD installs the soundcard.h header in sys/, not 
machine/.
pioto (author)
Wed Jul 09 21:44:10 -0700 2008
jkramer (committer)
Thu Jul 10 02:11:36 -0700 2008
commit  b229ce936ccbf24f36449045d0dc7e70190baad8
tree    48086ac3cb840afbc623164138c3567a11a24c57
parent  f151e238d1f44c73ebc117e3ee00c0dd68c1bd97
0
source/Makefile 
...
4
5
6
7
 
8
9
10
 
...
4
5
6
 
7
8
9
10
 
0
@@ -4,7 +4,7 @@ OBJECT  := $(subst .c,.o,$(SOURCE))
0
 BINARY  := shell-fm
0
 override LDFLAGS += $(shell pkg-config --exists ao && pkg-config ao --libs)
0
 LIBAO  := $(shell pkg-config --exists ao && echo -DLIBAO)
0
-override CFLAGS += -Os -Wall -W -I./include/ $(LIBAO)
0
+override CFLAGS += -Os -Wall -W -I./include/ $(LIBAO) $(shell pkg-config mad --cflags)
0
 
0
 .PHONY: clean tags cscope
0
 
0
source/mix.c 
...
15
16
17
18
 
19
20
21
 
...
15
16
17
 
18
19
20
21
 
0
@@ -15,7 +15,7 @@
0
 #include <soundcard.h>
0
 #endif
0
 #ifdef __FreeBSD__
0
-#include <machine/soundcard.h>
0
+#include <sys/soundcard.h>
0
 #endif
0
 #ifdef __linux__
0
 #include <linux/soundcard.h>
0
source/play.c 
...
23
24
25
 
 
 
 
 
 
 
 
26
27
28
 
 
29
30
31
 
...
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
 
0
@@ -23,9 +23,19 @@
0
 #ifdef LIBAO
0
 #include <ao/ao.h>
0
 #else
0
+
0
+#if (defined(__NetBSD__) || defined(__OpenBSD__))
0
+#include <soundcard.h>
0
+#endif
0
+#ifdef __FreeBSD__
0
+#include <sys/soundcard.h>
0
+#endif
0
+#ifdef __linux__
0
 #include <linux/soundcard.h>
0
 #endif
0
 
0
+#endif
0
+
0
 #include "settings.h"
0
 #include "pipe.h"
0
 #include "play.h"

Comments

    No one has commented yet.