mirror of
https://github.com/mpv-player/mpv
synced 2024-12-23 23:32:26 +00:00
Conditionally compile aclib.c instead of placing #ifdef around its content.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d365ca2eab
commit
49f88ad861
2
Makefile
2
Makefile
@ -211,7 +211,6 @@ SRCS_COMMON = asxparser.c \
|
||||
libmpdemux/video.c \
|
||||
libmpdemux/yuv4mpeg.c \
|
||||
libmpdemux/yuv4mpeg_ratio.c \
|
||||
libvo/aclib.c \
|
||||
libvo/osd.c \
|
||||
libvo/sub.c \
|
||||
osdep/$(GETCH) \
|
||||
@ -297,6 +296,7 @@ SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
|
||||
libfaad2/syntax.c \
|
||||
libfaad2/tns.c \
|
||||
|
||||
SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c
|
||||
SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c
|
||||
SRCS_COMMON-$(FTP) += stream/stream_ftp.c
|
||||
SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
|
||||
|
1
configure
vendored
1
configure
vendored
@ -8026,6 +8026,7 @@ ESD = $_esd
|
||||
FAAC=$_faac
|
||||
FAAD = $_faad
|
||||
FAAD_INTERNAL = $_faad_internal
|
||||
FASTMEMCPY = $_fastmemcpy
|
||||
FBDEV = $_fbdev
|
||||
FREETYPE = $_freetype
|
||||
FTP = $_ftp
|
||||
|
@ -22,8 +22,6 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#ifdef CONFIG_FASTMEMCPY
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include "cpudetect.h"
|
||||
@ -227,5 +225,3 @@ void * mem2agpcpy(void * to, const void * from, size_t len)
|
||||
#endif //!RUNTIME_CPUDETECT
|
||||
return to;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_FASTMEMCPY */
|
||||
|
Loading…
Reference in New Issue
Block a user