OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04d7f60
)
add our -L flags before any other linker flags
author
Måns Rullgård
<mans@mansr.com>
Sun, 10 Sep 2006 14:13:19 +0000
(14:13 +0000)
committer
Måns Rullgård
<mans@mansr.com>
Sun, 10 Sep 2006 14:13:19 +0000
(14:13 +0000)
Originally committed as revision 6220 to svn://svn.ffmpeg.org/ffmpeg/trunk
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
bf83752
..
dfa69aa
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-58,7
+58,7
@@
endif
OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-LDFLAGS
+= -L./libavformat -L./libavcodec -L./libavutil
+LDFLAGS
:= -L./libavformat -L./libavcodec -L./libavutil $(LDFLAGS)
EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
ifeq ($(CONFIG_SWSCALER),yes)