* Use -maltivec when building dependencies, or <altivec.h> cannot be used.

  * Do not declare vectors in non-AltiVec files.

git-svn-id: svn://svn.videolan.org/x264/trunk@630 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Makefile b/Makefile
index 61db07ea05cae8fab1d1430656dd287b497d95fa..8e81ba04f188a230a28fbbae6e350865bb8a668e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ common/i386/*.o: common/i386/i386inc.asm
 .depend: config.mak
        rm -f .depend
 # Hacky - because gcc 2.9x doesn't have -MT
-       $(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+       $(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
 
 config.mak: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
        ./configure $(CONFIGURE_ARGS)

diff --git a/common/ppc/quant.h b/common/ppc/quant.h
index 5375ede26a1cc5a77fd51c87bb6dc72375d72650..49ab01a5426fa76ca82ade78a5d1832d0f9771fc 100644 (file)
--- a/common/ppc/quant.h
+++ b/common/ppc/quant.h
@@ -18,7 +18,7 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/
 
-#ifdef SYS_LINUX
+#if defined SYS_LINUX && defined NEED_ALTIVEC
 #include <altivec.h>
 #endif
 
@@ -27,12 +27,16 @@
 
 typedef union {
   unsigned int s[4];
+#if defined NEED_ALTIVEC
   vector unsigned int v;
+#endif
 } vect_int_u;
 
 typedef union {
   unsigned short s[8];
+#if defined NEED_ALTIVEC
   vector unsigned short v;
+#endif
 } vect_ushort_u;
 
 void x264_quant_4x4_altivec( int16_t dct[4][4], int quant_mf[4][4], int const i_qbits, int const f );

diff --git a/configure b/configure
index 6a5fe262dd7797de223d5e94ea0f4a7f72f118d7..4b013b09667cb1f626b7c6bad390bb0a8a999bd1 100755 (executable)
--- a/configure
+++ b/configure
@@ -159,6 +159,7 @@ case "${MACHINE%%-*}" in
     ;;
   powerpc|powerpc64)
     ARCH="PPC"
+    ALTIVECFLAGS="$ALTIVECFLAGS -DNEED_ALTIVEC"
     if [ $SYS = MACOSX ]
     then
       ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4"