mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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
This commit is contained in:
parent
c6fa36cf58
commit
56b04ceb47
2
configure
vendored
2
configure
vendored
@ -1020,7 +1020,7 @@ int main( void ) { return (int) imlib_load_font("foo"); }
|
||||
EOF
|
||||
|
||||
imlib2=no
|
||||
if $cc -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then
|
||||
if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then
|
||||
imlib2=yes
|
||||
fi
|
||||
|
||||
|
@ -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)
|
||||
|
@ -30,13 +30,13 @@ install:
|
||||
install -m 755 $(HOOKS) "$(libdir)/vhook"
|
||||
|
||||
imlib2.so: imlib2.o
|
||||
$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
|
||||
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
|
||||
|
||||
drawtext.so: drawtext.o
|
||||
$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
|
||||
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
|
||||
|
||||
%.so: %.o
|
||||
$(CC) -g -o $@ $(SHFLAGS) $<
|
||||
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
|
||||
|
||||
clean:
|
||||
rm -f *.o *.d .depend *.so *~
|
||||
|
Loading…
Reference in New Issue
Block a user