Mercurial > mplayer.hg
changeset 10572:d7ec2e2bb0da
Simplified/fixed altivec/altivec.h detection on Linux and Darwin (and others). Patch by Magnus Damm <damm@opensource.se>
| author | alex |
|---|---|
| date | Mon, 11 Aug 2003 20:52:53 +0000 |
| parents | 07cfe1e1a2c9 |
| children | df0c8b49bc69 |
| files | Makefile configure liba52/Makefile libmpeg2/Makefile |
| diffstat | 4 files changed, 5 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Aug 11 20:04:30 2003 +0000 +++ b/Makefile Mon Aug 11 20:52:53 2003 +0000 @@ -40,14 +40,6 @@ CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) # -Wall -ifeq ($(TARGET_ALTIVEC),yes) -ifeq ($(TARGET_OS),Darwin) -CFLAGS += -faltivec -else -CFLAGS += -maltivec -mabi=altivec -endif -endif - PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf ifeq ($(VIDIX),yes) PARTS += libdha vidix
--- a/configure Mon Aug 11 20:04:30 2003 +0000 +++ b/configure Mon Aug 11 20:52:53 2003 +0000 @@ -865,6 +865,7 @@ proc='' _march='' _mcpu='' + _altivec_gcc_flags='' # XXX: this should be removed imho... cpu750=`$_cpuinfo | grep "cpu.*750"` if test -n "$cpu750"; then @@ -875,11 +876,13 @@ proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | head -1` if test -n "`$_cpuinfo | grep altivec`"; then _altivec=yes + _altivec_gcc_flags='-maltivec -mabi=altivec' fi fi if darwin ; then if [ `sysctl -n hw.vectorunit` -eq 1 ]; then _altivec=yes + _altivec_gcc_flags='-faltivec' fi fi if test -n "$proc"; then @@ -901,6 +904,7 @@ esac fi fi + _mcpu="$_mcpu $_altivec_gcc_flags" ;; alpha) @@ -2045,7 +2049,7 @@ int main(void) { return 0; } EOF _have_altivec_h=no -cc_check && _have_altivec_h=yes +cc_check $_altivec_gcc_flags && _have_altivec_h=yes if test "$_have_altivec_h" = yes ; then _def_altivec_h='#define HAVE_ALTIVEC_H 1' else
--- a/liba52/Makefile Mon Aug 11 20:04:30 2003 +0000 +++ b/liba52/Makefile Mon Aug 11 20:52:53 2003 +0000 @@ -7,13 +7,6 @@ OBJS = $(SRCS:.c=.o) CFLAGS = $(MLIB_INC) $(OPTFLAGS) -ifeq ($(TARGET_ALTIVEC),yes) -ifeq ($(TARGET_OS),Darwin) - CFLAGS+= -faltivec -else - CFLAGS+= -maltivec -mabi=altivec -endif -endif .SUFFIXES: .c .o
--- a/libmpeg2/Makefile Mon Aug 11 20:04:30 2003 +0000 +++ b/libmpeg2/Makefile Mon Aug 11 20:52:53 2003 +0000 @@ -10,11 +10,6 @@ CFLAGS = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY ifeq ($(TARGET_ALTIVEC),yes) -ifeq ($(TARGET_OS),Darwin) -CFLAGS += -faltivec -else -CFLAGS += -maltivec -mabi=altivec -endif SRCS += motion_comp_altivec.c idct_altivec.c endif