From e1e5fca19cf735db6338e794b8bf63d801d23f1e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 23 May 2015 18:09:29 +0200 Subject: [PATCH] Makefile: use absolute paths for static ffmpeg libraries, fixes #2872 --- Makefile | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 625ca8c94..16ba80421 100644 --- a/Makefile +++ b/Makefile @@ -57,12 +57,25 @@ endif ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes) CFLAGS += -I${ROOTDIR}/libav_static/build/ffmpeg/include -LDFLAGS += -L${ROOTDIR}/libav_static/build/ffmpeg/lib -Wl,-Bstatic \ - -lavresample -lswresample -lswscale \ - -lavutil -lavformat -lavcodec -lavutil \ - -lvorbisenc -lvorbis -logg -lx264 -lvpx \ - -Wl,-Bdynamic -ldl +LDFLAGS_FFDIR = ${ROOTDIR}/libav_static/build/ffmpeg/lib +LDFLAGS += ${LDFLAGS_FFDIR}/libavresample.a +LDFLAGS += ${LDFLAGS_FFDIR}/libswresample.a +LDFLAGS += ${LDFLAGS_FFDIR}/libswscale.a +LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a +LDFLAGS += ${LDFLAGS_FFDIR}/libavformat.a +LDFLAGS += ${LDFLAGS_FFDIR}/libavcodec.a +LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a +LDFLAGS += ${LDFLAGS_FFDIR}/libvorbisenc.a +LDFLAGS += ${LDFLAGS_FFDIR}/libvorbis.a +LDFLAGS += ${LDFLAGS_FFDIR}/libogg.a +ifeq ($(CONFIG_LIBFFMPEG_STATIC_X264),yes) +LDFLAGS += ${LDFLAGS_FFDIR}/libx264.a +else +LDFLAGS += -lx264 +endif +LDFLAGS += ${LDFLAGS_FFDIR}/libvpx.a endif + ifeq ($(CONFIG_HDHOMERUN_STATIC),yes) CFLAGS += -I${ROOTDIR}/libhdhomerun_static LDFLAGS += -L${ROOTDIR}/libhdhomerun_static/libhdhomerun \ -- 2.47.3