From 56b04ceb472f0807ec983aff11156c41103ab838 Mon Sep 17 00:00:00 2001
From: "Niki W. Waibel" <niki.waibel@gmx.net>
Date: Mon, 11 Jul 2005 00:15:37 +0000
Subject: [PATCH] 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
---
configure | 2 +-
libavformat/Makefile | 2 +-
vhook/Makefile | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index ae2aef4fe22..cf77f235f1d 100755
--- a/configure
+++ b/configure
@@ -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 9f2a8f33adf..42a26fe070a 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 c77ae144607..aedd8d1668e 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 *~
--
GitLab