libtheora's cpu.c assumes x86. b=449028. r=chris.double@double.co.nz
authorDoug Turner <dougt@meer.net>
Tue, 12 Aug 2008 07:09:41 -0700
changeset 16592 7703fa13d46c8244356e2973175860d2db62773a
parent 16591 6276d0c9a49d49bfb53bfb89ccd8bddf97ab6498
child 16593 d1be05700e20ee8ddf5403e11d9a5a659b98d17d
push idunknown
push userunknown
push dateunknown
reviewerschris.double
bugs449028
milestone1.9.1a2pre
libtheora's cpu.c assumes x86. b=449028. r=chris.double@double.co.nz
media/libtheora/lib/Makefile.in
--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -44,21 +44,19 @@ 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)
-DEFINES += -DOC_X86ASM
+ifneq ($(OS_ARCH),WINNT)
+DEFINES += -DOC_X86ASM -DUSE_ASM
 endif
-
-ifeq ($(OS_ARCH),Linux)
-DEFINES += -DUSE_ASM
 endif
 
 CSRCS		= \
 		cpu.c \
 		dec/huffdec.c \
 		dec/quant.c \
 		dec/dequant.c \
 		dec/bitwise.c \