git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
06a0d5e
)
lavu: Makefile: skip atomic.c if native atomics are available
author
Rodger Combs
<rodger.combs@gmail.com>
Wed, 1 Jul 2015 19:20:08 +0000
(14:20 -0500)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 1 Jul 2015 19:40:16 +0000
(21:40 +0200)
This prevents a linker warning and skips a useless compilation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/Makefile
patch
|
blob
|
history
diff --git
a/libavutil/Makefile
b/libavutil/Makefile
index
abfd10f
..
6fa810e
100644
(file)
--- a/
libavutil/Makefile
+++ b/
libavutil/Makefile
@@
-78,7
+78,6
@@
BUILT_HEADERS = avconfig.h \
OBJS = adler32.o \
aes.o \
- atomic.o \
audio_fifo.o \
avstring.o \
base64.o \
@@
-137,6
+136,8
@@
OBJS = adler32.o \
xga_font_data.o \
xtea.o \
+OBJS-$(!HAVE_ATOMICS_NATIVE) += atomic.o \
+
OBJS-$(CONFIG_LZO) += lzo.o
OBJS-$(CONFIG_OPENCL) += opencl.o opencl_internal.o