From cceccb6af3abfa06a8388ac51e3e042737d8a643 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 16 Dec 2014 12:53:13 -0500 Subject: [PATCH] Bug 1111227 - Remove the MSVC2005 special casing in gfx/2d/moz.build; r=glandium --HG-- extra : rebase_source : 0d86c3cff1f3775c0994a9f2f71762f77641ca18 --- gfx/2d/moz.build | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index e8b3a14b5966..467ac072ef8b 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -85,25 +85,23 @@ if CONFIG['MOZ_ENABLE_SKIA']: # Are we targeting x86 or x64? If so, build SSE2 files. if CONFIG['INTEL_ARCHITECTURE']: - # VC2005 doesn't support _mm_castsi128_ps, so SSE2 is turned off - if CONFIG['_MSC_VER'] != '1400': + SOURCES += [ + 'BlurSSE2.cpp', + 'FilterProcessingSSE2.cpp', + 'ImageScalingSSE2.cpp', + ] + if CONFIG['MOZ_ENABLE_SKIA']: SOURCES += [ - 'BlurSSE2.cpp', - 'FilterProcessingSSE2.cpp', - 'ImageScalingSSE2.cpp', + 'convolverSSE2.cpp', ] - if CONFIG['MOZ_ENABLE_SKIA']: - SOURCES += [ - 'convolverSSE2.cpp', - ] - DEFINES['USE_SSE2'] = True - # The file uses SSE2 intrinsics, so it needs special compile flags on some - # compilers. - SOURCES['BlurSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['FilterProcessingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['ImageScalingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - if CONFIG['MOZ_ENABLE_SKIA']: - SOURCES['convolverSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + DEFINES['USE_SSE2'] = True + # The file uses SSE2 intrinsics, so it needs special compile flags on some + # compilers. + SOURCES['BlurSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['FilterProcessingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['ImageScalingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + if CONFIG['MOZ_ENABLE_SKIA']: + SOURCES['convolverSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] UNIFIED_SOURCES += [ 'Blur.cpp',