Bug 712870 - Skia works on non-tier1 cpu. r=mattwoodrow

This commit is contained in:
Makoto Kato 2011-12-27 18:01:12 +09:00
Родитель 411a879695
Коммит 31925a170d
1 изменённых файлов: 20 добавлений и 7 удалений

Просмотреть файл

@ -302,22 +302,15 @@ EXPORTS_skia += \
$(NULL) $(NULL)
CPPSRCS += \ CPPSRCS += \
SkFontHost_mac_coretext.cpp \ SkFontHost_mac_coretext.cpp \
SkBitmapProcState_opts_SSE2.cpp \
SkBlitRow_opts_SSE2.cpp \
SkUtils_opts_SSE2.cpp \
opts_check_SSE2.cpp \
SkTime_Unix.cpp \ SkTime_Unix.cpp \
$(NULL) $(NULL)
endif endif
ifeq (android,$(MOZ_WIDGET_TOOLKIT)) ifeq (android,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += \ CPPSRCS += \
SkBitmapProcState_opts_arm.cpp \
SkBlitRow_opts_arm.cpp \
SkFontHost_FreeType.cpp \ SkFontHost_FreeType.cpp \
SkFontHost_android.cpp \ SkFontHost_android.cpp \
SkFontHost_gamma.cpp \ SkFontHost_gamma.cpp \
SkUtils_opts_none.cpp \
SkMMapStream.cpp \ SkMMapStream.cpp \
SkTime_Unix.cpp \ SkTime_Unix.cpp \
$(NULL) $(NULL)
@ -334,11 +327,31 @@ EXPORTS_skia += \
CPPSRCS += \ CPPSRCS += \
SkFontHost_win.cpp \ SkFontHost_win.cpp \
SkTime_win.cpp \ SkTime_win.cpp \
$(NULL)
endif
ifneq (,$(INTEL_ARCHITECTURE))
CPPSRCS += \
SkBitmapProcState_opts_SSE2.cpp \ SkBitmapProcState_opts_SSE2.cpp \
SkBlitRow_opts_SSE2.cpp \ SkBlitRow_opts_SSE2.cpp \
SkUtils_opts_SSE2.cpp \ SkUtils_opts_SSE2.cpp \
opts_check_SSE2.cpp \ opts_check_SSE2.cpp \
$(NULL) $(NULL)
else
ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
CPPSRCS += \
SkBitmapProcState_opts_arm.cpp \
SkBlitRow_opts_arm.cpp \
opts_check_arm.cpp \
$(NULL)
SSRCS += memset.arm.S
else
CPPSRCS += \
SkBitmapProcState_opts_none.cpp \
SkBlitRow_opts_none.cpp \
SkUtils_opts_none.cpp \
$(NULL)
endif
endif endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk