# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1184398125 0
# Node ID 2ff40f30af3146dda76bbe9e1bc1587ed90ba639
# Parent  2aee80dab68a635ce33266fbfe83390a9fc17817
Merged r3261:3262 from branches/SDL-1.2: MMX/YUV with __OPTIMIZE__.

"Mac OS X/x86 won't build the MMX/YUV inline assembly without optimizations
 enabled (not enough registers), so for now, we only build it if we see
 the __OPTIMIZE__ #define, which GCC provides when you build at -O1 or higher."

diff -r 2aee80dab68a -r 2ff40f30af31 src/video/SDL_yuv_mmx.c
--- a/src/video/SDL_yuv_mmx.c	Sat Jul 14 07:05:19 2007 +0000
+++ b/src/video/SDL_yuv_mmx.c	Sat Jul 14 07:28:45 2007 +0000
@@ -21,7 +21,7 @@
 */
 #include "SDL_config.h"
 
-#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
 
 #include "SDL_stdinc.h"
 
diff -r 2aee80dab68a -r 2ff40f30af31 src/video/SDL_yuv_sw.c
--- a/src/video/SDL_yuv_sw.c	Sat Jul 14 07:05:19 2007 +0000
+++ b/src/video/SDL_yuv_sw.c	Sat Jul 14 07:28:45 2007 +0000
@@ -117,7 +117,7 @@
 
 /* The colorspace conversion functions */
 
-#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
 extern void Color565DitherYV12MMX1X(int *colortab, Uint32 * rgb_2_pix,
                                     unsigned char *lum, unsigned char *cr,
                                     unsigned char *cb, unsigned char *out,
@@ -978,7 +978,7 @@
     case SDL_PIXELFORMAT_YV12:
     case SDL_PIXELFORMAT_IYUV:
         if (SDL_BYTESPERPIXEL(target_format) == 2) {
-#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
             /* inline assembly functions */
             if (SDL_HasMMX() && (Rmask == 0xF800) &&
                 (Gmask == 0x07E0) && (Bmask == 0x001F)
@@ -999,7 +999,7 @@
             swdata->Display2X = Color24DitherYV12Mod2X;
         }
         if (SDL_BYTESPERPIXEL(target_format) == 4) {
-#if (__GNUC__ > 2) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
             /* inline assembly functions */
             if (SDL_HasMMX() && (Rmask == 0x00FF0000) &&
                 (Gmask == 0x0000FF00) &&