Author: diego Date: Sun Feb 8 04:42:00 2009 New Revision: 28483 Log: Conditionally compile aclib.c instead of placing #ifdef around its content. Modified: trunk/Makefile trunk/configure trunk/libvo/aclib.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Feb 8 04:39:07 2009 (r28482) +++ trunk/Makefile Sun Feb 8 04:42:00 2009 (r28483) @@ -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/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 Modified: trunk/configure ============================================================================== --- trunk/configure Sun Feb 8 04:39:07 2009 (r28482) +++ trunk/configure Sun Feb 8 04:42:00 2009 (r28483) @@ -8026,6 +8026,7 @@ ESD = $_esd FAAC=$_faac FAAD = $_faad FAAD_INTERNAL = $_faad_internal +FASTMEMCPY = $_fastmemcpy FBDEV = $_fbdev FREETYPE = $_freetype FTP = $_ftp Modified: trunk/libvo/aclib.c ============================================================================== --- trunk/libvo/aclib.c Sun Feb 8 04:39:07 2009 (r28482) +++ trunk/libvo/aclib.c Sun Feb 8 04:42:00 2009 (r28483) @@ -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 #endif //!RUNTIME_CPUDETECT return to; } - -#endif /* CONFIG_FASTMEMCPY */