gtk2/pixops.c, gtk2/Makefile: prevent MMX on all x86_64, not just OS X

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1263 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 070e3ddff605353ca25ac48118e9112dd60b8a41..1a632d71c4aaa26fce65832a9947facfb4f72e8f 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -18,10 +18,8 @@ LDFLAGS += `pkg-config gdk-pixbuf-2.0 --libs`
 endif
 
 ifdef MMX_FLAGS
-ifneq ($(targetos),Darwin)
+ifndef ARCH_X86_64
 ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o
-else
-CFLAGS += -DDARWIN 
 endif
 endif
 

diff --git a/src/modules/gtk2/pixops.c b/src/modules/gtk2/pixops.c
index a4fd8b05b8b433e68dcc8b9d1d0e4c6d2a13b7fe..05b8292874c47a442834b4309551d328b6cdce49 100644 (file)
--- a/src/modules/gtk2/pixops.c
+++ b/src/modules/gtk2/pixops.c
@@ -61,7 +61,7 @@ typedef void ( *PixopsPixelFunc ) ( guchar *dest, guint y1, guint cr, guint y2,
 
 
 /* mmx function declarations */
-#if defined(USE_MMX) && !defined(DARWIN)
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
 guchar *pixops_scale_line_22_yuv_mmx ( guint32 weights[ 16 ][ 8 ], guchar *p, guchar *q1, guchar *q2, int x_step, guchar *p_stop, int x_init, int destx );
 int pixops_have_mmx ( void );
 #endif
@@ -159,7 +159,7 @@ scale_line ( int *weights, int n_x, int n_y,
        return dest;
 }
 
-#if defined(USE_MMX) && !defined(DARWIN)
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
 static inline guchar *
 scale_line_22_yuv_mmx_stub ( int *weights, int n_x, int n_y,
                             guchar *dest, int dest_x, guchar *dest_end,
@@ -718,7 +718,7 @@ yuv422_scale ( guchar *dest_buf,
        PixopsFilter filter = { { 0, 0, 0}, { 0, 0, 0 }, 0 };
        PixopsLineFunc line_func;
 
-#if defined(USE_MMX) && !defined(DARWIN)
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
        gboolean found_mmx = pixops_have_mmx();
 #endif
 
@@ -743,7 +743,7 @@ yuv422_scale ( guchar *dest_buf,
 
        if ( filter.x.n == 2 && filter.y.n == 2 )
        {
-#if defined(USE_MMX) && !defined(DARWIN)
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
                if ( found_mmx )
                {
                        //fprintf( stderr, "rescale: using mmx\n" );