aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorNiki W. Waibel <niki.waibel@gmx.net>2005-07-11 00:15:37 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-07-11 00:15:37 +0000
commit56b04ceb472f0807ec983aff11156c41103ab838 (patch)
tree2866898f2cfc4bb9216de2e10f66663cf29be856 /libavformat
parentc6fa36cf587c63bb8eb4dda0dd5ef0f8a7441af4 (diff)
downloadffmpeg-56b04ceb472f0807ec983aff11156c41103ab838.tar.gz
compiling using nonstd include/library locations / add LDFLAGS to a few places patch by (Niki W. Waibel - nikiwaibel)
Originally committed as revision 4429 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 9f2a8f33ad..42a26fe070 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -101,7 +101,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def)
else
- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
endif
depend: $(SRCS)