Commit 483030a0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Move Altivec memcpy to altivec directory

parent 751329b4
......@@ -1546,6 +1546,7 @@ AC_ARG_ENABLE(altivec,
AS_IF([test "${host_cpu}" = "powerpc"],
[enable_altivec=yes], [enable_altivec=no])
])
have_altivec="no"
AS_IF([test "${enable_altivec}" = "yes"], [
ARCH="${ARCH} altivec";
AC_CACHE_CHECK([if $CC groks AltiVec inline assembly],
......@@ -1568,7 +1569,7 @@ AS_IF([test "${enable_altivec}" = "yes"], [
VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}])
])
VLC_ADD_PLUGIN([memcpyaltivec])
have_altivec="yes"
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
......@@ -1631,7 +1632,7 @@ dnl - Others: test should fail
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
VLC_ADD_PLUGIN([memcpyaltivec])
have_altivec="yes"
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
......@@ -1645,6 +1646,7 @@ dnl - Others: test should fail
VLC_ADD_LDFLAGS([libvlccore idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib])
])
])
AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
dnl
dnl Special arch tuning
......@@ -5179,7 +5181,6 @@ AC_CONFIG_FILES([
modules/misc/Makefile
modules/misc/dummy/Makefile
modules/misc/lua/Makefile
modules/misc/memcpy/Makefile
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile
......@@ -5203,6 +5204,7 @@ AC_CONFIG_FILES([
modules/mmx/Makefile
modules/mmxext/Makefile
modules/3dnow/Makefile
modules/altivec/Makefile
])
dnl Generate makefiles
......
......@@ -40,6 +40,9 @@ endif
if HAVE_3DNOW
SUBDIRS += 3dnow
endif
if HAVE_ALTIVEC
SUBDIRS += altivec
endif
dist_noinst_SCRIPTS = genmf list.sh
dist_noinst_DATA = LIST
libmemcpyaltivec_plugin_la_SOURCES = memcpy.c
libmemcpyaltivec_plugin_la_CFLAGS = $(AM_CFLAGS)
libmemcpyaltivec_plugin_la_LIBADD = $(AM_LIBADD)
libmemcpyaltivec_plugin_la_DEPENDENCIES =
libvlc_LTLIBRARIES += \
libmemcpyaltivec_plugin.la \
$(NULL)
/*****************************************************************************
* memcpyaltivec.c : AltiVec memcpy module
* memcpy.c : AltiVec memcpy module
*****************************************************************************
* Copyright (C) 2001 the VideoLAN team
* $Id$
......@@ -61,7 +61,6 @@ vlc_module_begin ()
set_description( N_("AltiVec memcpy") )
set_category( CAT_ADVANCED )
set_subcategory( SUBCAT_ADVANCED_MISC )
add_requirement( ALTIVEC )
set_capability( "memcpy", 100 )
set_callbacks( Activate, NULL )
add_shortcut( "altivec" )
......
BASE_SUBDIRS = dummy memcpy notify testsuite playlist stats osd xml
BASE_SUBDIRS = dummy notify testsuite playlist stats osd xml
EXTRA_SUBDIRS = lua
SUBDIRS = $(BASE_SUBDIRS)
......
SOURCES_memcpyaltivec = \
memcpyaltivec.c \
$(NULL)
......@@ -310,6 +310,7 @@ modules/access_output/http.c
modules/access_output/rtmp.c
modules/access_output/shout.c
modules/access_output/udp.c
modules/altivec/memcpy.c
modules/audio_filter/channel_mixer/dolby.c
modules/audio_filter/channel_mixer/headphone.c
modules/audio_filter/channel_mixer/mono.c
......@@ -976,7 +977,6 @@ modules/misc/lua/libs/volume.c
modules/misc/lua/meta.c
modules/misc/lua/vlc.c
modules/misc/lua/vlc.h
modules/misc/memcpy/memcpyaltivec.c
modules/misc/notify/growl.m
modules/misc/notify/growl_udp.c
modules/misc/notify/msn.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment