virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

FFLIBS --> EXTRALIBS

Browse Source 
Originally committed as revision 6203 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-09-08 18:28:58 +00:00
parent f381af7b7f
commit 6de9e50649
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -59,11 +59,11 @@ endif
OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
LDFLAGS += -L./libavformat -L./libavcodec -L./libavutil LDFLAGS += -L./libavformat -L./libavcodec -L./libavutil
FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) EXTRALIBS += -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
ifeq ($(CONFIG_SWSCALER),yes) ifeq ($(CONFIG_SWSCALER),yes)
LDFLAGS+=-L./libswscale LDFLAGS+=-L./libswscale
FFLIBS+=-lswscale$(BUILDSUF) EXTRALIBS+=-lswscale$(BUILDSUF)
endif endif
all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
@ -80,13 +80,13 @@ ifeq ($(CONFIG_SWSCALER),yes)
endif endif
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
ffserver$(EXESUF): ffserver.o .libs ffserver$(EXESUF): ffserver.o .libs
$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
%$(EXESUF): %_g$(EXESUF) %$(EXESUF): %_g$(EXESUF)
cp -p $< $@ cp -p $< $@
@ -97,7 +97,7 @@ version.h:
$(SRC_PATH)/version.sh "$(SRC_PATH)" $(SRC_PATH)/version.sh "$(SRC_PATH)"
output_example$(EXESUF): output_example.o .libs output_example$(EXESUF): output_example.o .libs
$(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
qt-faststart$(EXESUF): qt-faststart.c qt-faststart$(EXESUF): qt-faststart.c
$(CC) $(CFLAGS) $(SRC_PATH)/$< -o $@ $(CC) $(CFLAGS) $(SRC_PATH)/$< -o $@