From 1a8c791611e99c8d61c80bb399fa4bb6df4f661f Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 6 May 2013 08:51:56 +0000 Subject: [PATCH] Only define SSE2 if necessary BUG=224 TEST=compile with gcc 4.8 on msys Review URL: https://webrtc-codereview.appspot.com/1411004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@684 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- util/ssim.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 4fc980308..b826c3156 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 683 +Version: 684 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 74545dbcf..eba9810c3 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 683 +#define LIBYUV_VERSION 684 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/util/ssim.cc b/util/ssim.cc index f2aca02fd..277561dd0 100644 --- a/util/ssim.cc +++ b/util/ssim.cc @@ -20,7 +20,7 @@ extern "C" { typedef unsigned int uint32; // NOLINT typedef unsigned short uint16; // NOLINT -#if !defined(LIBYUV_DISABLE_X86) && \ +#if !defined(LIBYUV_DISABLE_X86) && !defined(__SSE2__) && \ (defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2))) #define __SSE2__ #endif