mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
More fixes to compile and build on more platforms.
Originally committed as revision 1280 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
35fedfc349
commit
9c938e77e8
4
Makefile
4
Makefile
@ -69,7 +69,7 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
|
||||
ffserver$(EXE): ffserver.o $(DEP_LIBS)
|
||||
$(CC) $(LDFLAGS) $(FFSLDFLAGS) \
|
||||
-o $@ ffserver.o -L./libavcodec -L./libavformat \
|
||||
-lavformat -lavcodec -ldl $(EXTRALIBS)
|
||||
-lavformat -lavcodec $(EXTRALIBS)
|
||||
|
||||
ffplay: ffmpeg$(EXE)
|
||||
ln -sf $< $@
|
||||
@ -120,7 +120,7 @@ TAGS:
|
||||
# regression tests
|
||||
|
||||
libavtest test mpeg4 mpeg: ffmpeg$(EXE)
|
||||
make -C tests $@
|
||||
$(MAKE) -C tests $@
|
||||
|
||||
ifneq ($(wildcard .depend),)
|
||||
include .depend
|
||||
|
18
configure
vendored
18
configure
vendored
@ -100,6 +100,12 @@ else
|
||||
netserver="yes"
|
||||
extralibs="-lnet"
|
||||
fi ;;
|
||||
FreeBSD)
|
||||
v4l="no"
|
||||
audio_oss="yes"
|
||||
make="gmake"
|
||||
LDFLAGS="-export-dynamic"
|
||||
;;
|
||||
BSD/OS)
|
||||
v4l="no"
|
||||
audio_oss="yes"
|
||||
@ -148,10 +154,17 @@ cat > $TMPC << EOF
|
||||
int main( void ) { return (int) dlopen("foo", 0); }
|
||||
EOF
|
||||
|
||||
ldl=-ldl
|
||||
|
||||
if $cc -o $TMPO $TMPC -ldl 2> /dev/null ; then
|
||||
vhook=yes
|
||||
fi
|
||||
|
||||
if $cc -o $TMPO $TMPC 2> /dev/null ; then
|
||||
vhook=yes
|
||||
ldl=""
|
||||
fi
|
||||
|
||||
cat > $TMPC << EOF
|
||||
#include <X11/Xlib.h>
|
||||
#include <Imlib2.h>
|
||||
@ -201,7 +214,7 @@ for opt do
|
||||
;;
|
||||
--disable-a52) a52="no"
|
||||
;;
|
||||
--enable-a52bin) a52bin="yes" ; extralibs="-ldl $extralibs"
|
||||
--enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs"
|
||||
;;
|
||||
--enable-mp3lame) mp3lame="yes"
|
||||
;;
|
||||
@ -475,7 +488,6 @@ echo "STRIP=$strip" >> config.mak
|
||||
echo "OPTFLAGS=$CFLAGS" >> config.mak
|
||||
echo "LDFLAGS=$LDFLAGS" >> config.mak
|
||||
echo "SHFLAGS=$SHFLAGS" >> config.mak
|
||||
echo "LDFLAGS=$LDFLAGS" >> config.mak
|
||||
if test "$cpu" = "x86" ; then
|
||||
echo "TARGET_ARCH_X86=yes" >> config.mak
|
||||
echo "#define ARCH_X86 1" >> $TMPH
|
||||
@ -529,7 +541,7 @@ fi
|
||||
if test "$vhook" = "yes" ; then
|
||||
echo "BUILD_VHOOK=yes" >> config.mak
|
||||
echo "#define HAVE_VHOOK 1" >> $TMPH
|
||||
extralibs="$extralibs -ldl"
|
||||
extralibs="$extralibs $ldl"
|
||||
fi
|
||||
if test "$lshared" = "yes" ; then
|
||||
echo "BUILD_SHARED=yes" >> config.mak
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "avformat.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <netinet/in.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
@ -31,6 +30,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
#include <ctype.h>
|
||||
|
Loading…
Reference in New Issue
Block a user