diff options
| author | Niki W. Waibel <niki.waibel@gmx.net> | 2005-07-11 00:15:37 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-11 00:15:37 +0000 |
| commit | 56b04ceb472f0807ec983aff11156c41103ab838 (patch) | |
| tree | 2866898f2cfc4bb9216de2e10f66663cf29be856 | |
| parent | c6fa36cf587c63bb8eb4dda0dd5ef0f8a7441af4 (diff) | |
| download | ffmpeg-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
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | vhook/Makefile | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -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 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) diff --git a/vhook/Makefile b/vhook/Makefile index c77ae14460..aedd8d1668 100644 --- a/vhook/Makefile +++ b/vhook/Makefile @@ -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 *~ |