Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Makefile: a little cleanups and remove the -lavfilter completely
  • Loading branch information
perexg committed Nov 3, 2015
1 parent c3d8919 commit f5b7563
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions Makefile
Expand Up @@ -60,6 +60,7 @@ CFLAGS += -Wno-parentheses-equality -Wno-incompatible-pointer-types
endif

ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes)

CFLAGS += -I${ROOTDIR}/libav_static/build/ffmpeg/include
LDFLAGS_FFDIR = ${ROOTDIR}/libav_static/build/ffmpeg/lib
LDFLAGS += ${LDFLAGS_FFDIR}/libavresample.a
Expand All @@ -72,20 +73,25 @@ LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a
LDFLAGS += ${LDFLAGS_FFDIR}/libvorbisenc.a
LDFLAGS += ${LDFLAGS_FFDIR}/libvorbis.a
LDFLAGS += ${LDFLAGS_FFDIR}/libogg.a

ifeq ($(CONFIG_LIBX264_STATIC),yes)
LDFLAGS += ${LDFLAGS_FFDIR}/libx264.a -ldl
else
LDFLAGS += -lx264 -ldl
endif

ifeq ($(CONFIG_LIBX265),yes)
ifeq ($(CONFIG_LIBX265_STATIC),yes)
LDFLAGS += ${LDFLAGS_FFDIR}/libx265.a -lstdc++
else
LDFLAGS += -lx265
endif
endif

LDFLAGS += ${LDFLAGS_FFDIR}/libvpx.a

CONFIG_LIBMFX_VA_LIBS =

ifeq ($(CONFIG_LIBMFX),yes)
CONFIG_LIBMFX_VA_LIBS += -lva
ifeq ($(CONFIG_VA_DRM),yes)
Expand All @@ -101,10 +107,8 @@ LDFLAGS += -lmfx
endif
LDFLAGS += ${CONFIG_LIBMFX_VA_LIBS}
endif
ifneq ($(CONFIG_LIBMFX_STATIC),yes)
LDFLAGS += -lavfilter
endif
endif

endif # CONFIG_LIBFFMPEG_STATIC

ifeq ($(CONFIG_HDHOMERUN_STATIC),yes)
CFLAGS += -I${ROOTDIR}/libhdhomerun_static
Expand Down

0 comments on commit f5b7563

Please sign in to comment.