Merge m-c to inbound.

This commit is contained in:
Ryan VanderMeulen 2012-05-17 23:23:57 -04:00
commit 2bc5761600

View File

@ -120,9 +120,12 @@ endif
# Are we targeting x86 or x64? If so, build SSE2 files.
ifneq (,$(INTEL_ARCHITECTURE))
# VC2005 doesn't support _mm_castsi128_ps, so SSE2 is turned off
ifneq (1400,$(_MSC_VER))
CPPSRCS += ImageScalingSSE2.cpp
DEFINES += -DUSE_SSE2
endif
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
CPPSRCS += \