[FFmpeg-cvslog] build: fix compilation of tools with OpenCL enabled
James Almer
git at videolan.org
Tue Oct 3 17:59:35 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 3 10:55:59 2017 -0300| [3e6829a8aa1ec687086669551aee45743ac25691] | committer: James Almer
build: fix compilation of tools with OpenCL enabled
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e6829a8aa1ec687086669551aee45743ac25691
---
fftools/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fftools/Makefile b/fftools/Makefile
index 094f6d6265..c867814a71 100644
--- a/fftools/Makefile
+++ b/fftools/Makefile
@@ -20,7 +20,6 @@ OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += fftools/ffmpeg_videotoolbox.o
OBJS-ffserver += fftools/ffserver_config.o
define DOFFTOOL
-OBJS-$(1)-$(CONFIG_OPENCL) += fftools/cmdutils_opencl.o
OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes)
$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
$$(OBJS-$(1)): | fftools
@@ -30,6 +29,7 @@ $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1))
-include $$(OBJS-$(1):.o=.d)
endef
+$(foreach P,$(AVPROGS-yes),$(eval OBJS-$(P)-$(CONFIG_OPENCL) += fftools/cmdutils_opencl.o))
$(foreach P,$(AVPROGS-yes),$(eval $(call DOFFTOOL,$(P))))
all: $(AVPROGS)
More information about the ffmpeg-cvslog
mailing list