Revision ef0bc4c9

View differences:

Makefile
33 33
	$(MAKE) -C libav all
34 34

  
35 35
ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
36
	$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
36
	$(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
37 37

  
38 38
ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
39
	$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
39
	$(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
40 40

  
41 41
ffplay: ffmpeg$(EXE)
42 42
	ln -sf $< $@
configure
27 27
ar="ar"
28 28
cpu=`uname -m`
29 29
case "$cpu" in
30
  i386|i486|i586|i686|i86pc)
30
  i386|i486|i586|i686|i86pc|BePC)
31 31
    cpu="x86"
32 32
    mmx="yes"
33 33
  ;;
......
46 46
gprof="no"
47 47
grab="yes"
48 48
win32="no"
49
extralibs="-lm"
50

  
51
# OS specific
52
targetos=`uname -s`
53
case $targetos in
54
BeOS)
55
prefix="/boot/home/config"
56
# helps building libavcodec
57
grab="no"
58
CFLAGS="-O2 -DPIC"
59
# no need for libm, but the inet stuff
60
# Check for BONE
61
if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then
62
extralibs="-lbind -lsocket"
63
else
64
echo "Not sure building for net_server will succeed... good luck."
65
extralibs="-lsocket"
66
fi ;;
67
*) ;;
68
esac
49 69

  
50 70
if [ "$1" = "-h" -o "$1" = "--help" ] ; then
51 71
cat << EOF
......
167 187
else
168 188
  echo "BUILD_SHARED=no" >> config.mak
169 189
fi
190
echo "EXTRALIBS=$extralibs" >> config.mak
170 191
echo -n "VERSION=" >>config.mak
171 192
head VERSION >>config.mak
172 193
echo "" >>config.mak
ffmpeg.c
1801 1801
/* open the necessary output devices for playing */
1802 1802
void prepare_play(void)
1803 1803
{
1804
#ifndef __BEOS__
1804 1805
    file_format = guess_format("audio_device", NULL, NULL);
1805 1806
    if (!file_format) {
1806 1807
        fprintf(stderr, "Could not find audio device\n");
......
1808 1809
    }
1809 1810
    
1810 1811
    opt_output_file(audio_device);
1812
#endif
1811 1813
}
1812 1814

  
1813 1815

  

Also available in: Unified diff