summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-08 03:42:00 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-08 03:42:00 +0000
commit49f88ad86128a0aea5ff9525da3193baeeeb3887 (patch)
tree29d6105ad235c1e99f0dccfdafeb375fe625959b
parentd365ca2eab68ac558acbe616e662d020ab4853b6 (diff)
downloadmpv-49f88ad86128a0aea5ff9525da3193baeeeb3887.tar.bz2
mpv-49f88ad86128a0aea5ff9525da3193baeeeb3887.tar.xz
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
-rw-r--r--Makefile2
-rwxr-xr-xconfigure1
-rw-r--r--libvo/aclib.c4
3 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 71f9ef681e..2fed37f9a2 100644
--- a/Makefile
+++ b/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
diff --git a/configure b/configure
index 945e51cf9a..12bc4a7171 100755
--- a/configure
+++ b/configure
@@ -8026,6 +8026,7 @@ ESD = $_esd
FAAC=$_faac
FAAD = $_faad
FAAD_INTERNAL = $_faad_internal
+FASTMEMCPY = $_fastmemcpy
FBDEV = $_fbdev
FREETYPE = $_freetype
FTP = $_ftp
diff --git a/libvo/aclib.c b/libvo/aclib.c
index c1ac4234a7..cae86dd3d4 100644
--- a/libvo/aclib.c
+++ b/libvo/aclib.c
@@ -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 */