libav: improve port check

Fixes #2322
This commit is contained in:
Christian Prochaska 2017-03-13 14:30:15 +01:00 committed by Christian Helmuth
parent 517c098632
commit 79fc33aca8
10 changed files with 10 additions and 10 deletions

View File

@ -5,7 +5,7 @@ include $(REP_DIR)/lib/import/import-avcodec.mk
LIBAV_PORT_DIR := $(call select_from_ports,libav)
LIBAVCODEC_DIR := $(LIBAV_PORT_DIR)/src/lib/libav/libavcodec
include $(LIBAVCODEC_DIR)/Makefile
-include $(LIBAVCODEC_DIR)/Makefile
LIBS += zlib

View File

@ -4,6 +4,6 @@ include $(REP_DIR)/lib/import/import-avfilter.mk
LIBAVFILTER_DIR = $(call select_from_ports,libav)/src/lib/libav/libavfilter
include $(LIBAVFILTER_DIR)/Makefile
-include $(LIBAVFILTER_DIR)/Makefile
vpath % $(LIBAVFILTER_DIR)

View File

@ -4,7 +4,7 @@ include $(REP_DIR)/lib/import/import-avformat.mk
LIBAVFORMAT_DIR = $(call select_from_ports,libav)/src/lib/libav/libavformat
include $(LIBAVFORMAT_DIR)/Makefile
-include $(LIBAVFORMAT_DIR)/Makefile
LIBS += avcodec avutil zlib

View File

@ -4,6 +4,6 @@ include $(REP_DIR)/lib/import/import-avresample.mk
LIBAVRESAMPLE_DIR = $(call select_from_ports,libav)/src/lib/libav/libavresample
include $(LIBAVRESAMPLE_DIR)/Makefile
-include $(LIBAVRESAMPLE_DIR)/Makefile
vpath % $(LIBAVRESAMPLE_DIR)

View File

@ -4,6 +4,6 @@ include $(REP_DIR)/lib/import/import-avutil.mk
LIBAVUTIL_DIR = $(call select_from_ports,libav)/src/lib/libav/libavutil
include $(LIBAVUTIL_DIR)/Makefile
-include $(LIBAVUTIL_DIR)/Makefile
vpath % $(LIBAVUTIL_DIR)

View File

@ -2,4 +2,4 @@ CC_C_OPT += -DARCH_ARM=1
include $(REP_DIR)/lib/mk/avcodec.inc
include $(LIBAVCODEC_DIR)/arm/Makefile
-include $(LIBAVCODEC_DIR)/arm/Makefile

View File

@ -5,4 +5,4 @@ CC_C_OPT += -DARCH_ARM=1
include $(REP_DIR)/lib/mk/avutil.inc
include $(LIBAVUTIL_DIR)/arm/Makefile
-include $(LIBAVUTIL_DIR)/arm/Makefile

View File

@ -2,4 +2,4 @@ CC_C_OPT += -DARCH_X86=1
include $(REP_DIR)/lib/mk/avcodec.inc
include $(LIBAVCODEC_DIR)/x86/Makefile
-include $(LIBAVCODEC_DIR)/x86/Makefile

View File

@ -5,4 +5,4 @@ CC_C_OPT += -DARCH_X86=1
include $(REP_DIR)/lib/mk/avutil.inc
include $(LIBAVUTIL_DIR)/x86/Makefile
-include $(LIBAVUTIL_DIR)/x86/Makefile

View File

@ -6,6 +6,6 @@ CC_WARN += -Wno-switch
LIBSWSCALE_DIR = $(call select_from_ports,libav)/src/lib/libav/libswscale
include $(LIBSWSCALE_DIR)/Makefile
-include $(LIBSWSCALE_DIR)/Makefile
vpath % $(LIBSWSCALE_DIR)