History

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master: Fix make checkheaders without opencl headers.

Michael Niedermayer committed 13 years ago

Commit c2085762 parents d3fc2db c484b3a2 files · +3 −0Browse files

Unified · Split

2 files
  1. libavfilter/Makefile +2 −0
  2. libavutil/Makefile +1 −0
libavfilter/Makefile+2−0
@@ -222,6 +222,8 @@ OBJS-$(CONFIG_SHOWWAVES_FILTER) += avf_showwaves.o · 221 unmodified lines
222222 OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o
223223 OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o
224224
225+SKIPHEADERS-$(CONFIG_OPENCL) += deshake_kernel.h
226+
225227 TOOLS = graph2dot
226228 TESTPROGS = drawutils filtfmts formats
227229
libavutil/Makefile+1−0
@@ -117,6 +117,7 @@ SKIPHEADERS = old_pix_fmts.h · 116 unmodified lines
117117 SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h
118118 SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h
119119 SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h
120+SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h
120121
121122 TESTPROGS = adler32 \
122123 aes \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t