* compilation fix (ARM users please check)

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 86a405364151be5b0b39092790ee1214e8f41632..e49c0619392ffa5caa5e755714793072fb26f006 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,13 @@ include config.mak
 VPATH=$(SRC_PATH)
 
 CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ifeq ($(CONFIG_DARWIN),yes)
+LDFLAGS+= -g -d
+FFSLDFLAGS= -Wl,-bind_at_load
+else
 LDFLAGS+= -g -Wl,--warn-common
+FFSLDFLAGS= -Wl,-E
+endif
 
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
@@ -22,6 +28,9 @@ EXT=
 PROG=ffmpeg ffplay ffserver
 endif
 
+ifeq ($(CONFIG_AUDIO_BEOS),yes)
+EXTRALIBS+=-lmedia -lbe
+endif
 
 ifeq ($(BUILD_SHARED),yes)
 DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a
@@ -30,6 +39,9 @@ DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
+ifeq ($(CONFIG_VORBIS),yes)
+EXTRALIBS+=-logg -lvorbis -lvorbisenc
+endif
 endif
 
 OBJS = ffmpeg.o ffserver.o
@@ -46,10 +58,11 @@ ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
               -lavformat -lavcodec $(EXTRALIBS)
 
 ffmpeg$(EXE): ffmpeg_g$(EXE)
-       $(STRIP) -o $@ $<
+       cp -p $< $@ ; $(STRIP) $@
 
 ffserver$(EXE): ffserver.o $(DEP_LIBS)
-       $(CC) $(LDFLAGS) -Wl,-E -o $@ ffserver.o -L./libavcodec -L./libav \
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
+               -o $@ ffserver.o -L./libavcodec -L./libav \
               -lavformat -lavcodec -ldl $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
@@ -60,6 +73,7 @@ ffplay: ffmpeg$(EXE)
 
 install: all
        $(MAKE) -C libavcodec install
+       install -d $(prefix)/bin
        install -s -m 755 $(PROG) $(prefix)/bin
        ln -sf ffmpeg $(prefix)/bin/ffplay