Bug 474937 - Fix Windows crashes with video element caused by buggy mmx/sse optimisations - rs=roc
authorChris Double <chris.double@double.co.nz>
Mon, 26 Jan 2009 00:03:26 +1300
changeset 24194 b62f99aa1fb6a9d10ecfbe3cb18e19d1ce074c08
parent 24193 8638587c1c1f180bd58fbdd27754adef7873bdfd
child 24195 62810acebb2716181ea3bf32a4a15ab1b76f103b
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs474937
milestone1.9.2a1pre
Bug 474937 - Fix Windows crashes with video element caused by buggy mmx/sse optimisations - rs=roc
media/libtheora/lib/Makefile.in
--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -43,20 +43,22 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= theora
 LIBRARY_NAME	= theora
 FORCE_STATIC_LIB= 1
 
 # The encoder is currently not included.
 DEFINES += -DTHEORA_DISABLE_ENCODE
 
 ifeq ($(findstring 86,$(OS_TEST)), 86)
+ifneq ($(OS_ARCH),WINNT)
 ifneq ($(OS_ARCH),SunOS)
 DEFINES += -DOC_X86ASM -DUSE_ASM
 endif
 endif
+endif
 
 VPATH		:= $(srcdir) $(srcdir)/dec
 
 CSRCS		= \
 		cpu.c \
 		huffdec.c \
 		quant.c \
 		dequant.c \
@@ -68,33 +70,21 @@ CSRCS		= \
 		state.c \
 		info.c \
 		fragment.c \
 		apiwrapper.c \
 		decode.c \
 		$(NULL)
 
 ifeq ($(findstring 86,$(OS_TEST)), 86)
-ifeq ($(OS_ARCH),WINNT)
-VPATH		+= $(srcdir)/dec/x86_vc
-
-CSRCS		+= \
-		mmxfrag.c \
-		mmxloopfilter.c \
-		x86state.c \
-		mmxstate.c \
-		mmxidct.c \
-		$(NULL)
-else
 VPATH		+= $(srcdir)/dec/x86
 
 CSRCS		+= \
 		mmxfrag.c \
 		x86state.c \
 		mmxstate.c \
 		mmxidct.c \
 		$(NULL)
 endif
-endif
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = -I$(srcdir)