[packages/utvideo] - merged update for 12.0.1

[qboosh]

commit d474c5e28a4ec574d77a99a2db2ba3a6af8ddab7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 14 14:30:47 2013 +0200

    - merged update for 12.0.1

 utvideo-makefile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/utvideo-makefile b/utvideo-makefile
index 15c33c6..b2b8ac9 100644
--- a/utvideo-makefile
+++ b/utvideo-makefile
@@ -34,7 +34,6 @@ endif
 OBJ = $(UTV_CORE_DIR)/Codec.o \
       $(UTV_CORE_DIR)/Convert.o \
       $(UTV_CORE_DIR)/DummyCodec.o \
-      $(UTV_CORE_DIR)/Format.o \
       $(UTV_CORE_DIR)/FrameBuffer.o \
       $(UTV_CORE_DIR)/GlobalConfig.o \
       $(UTV_CORE_DIR)/HuffmanCode.o \
@@ -48,6 +47,20 @@ OBJ = $(UTV_CORE_DIR)/Codec.o \
       $(UTV_CORE_DIR)/ULY2Codec.o \
       $(UTV_CORE_DIR)/utv_core.o
 
+ifeq ($(ARCH),i386)
+OBJ+=$(UTV_CORE_DIR)/TunedFunc_x86.o \
+	$(UTV_CORE_DIR)/Convert_asm_x86.o \
+	$(UTV_CORE_DIR)/HuffmanCode_asm_x86.o \
+	$(UTV_CORE_DIR)/Predict_asm_x86.o
+endif
+# note: TunedFunc_x64.cpp supports only MSC
+#ifeq ($(ARCH),x86_64)
+#OBJ+=$(UTV_CORE_DIR)/TunedFunc_x64.o \
+#	$(UTV_CORE_DIR)/Convert_asm_x64.o \
+#	$(UTV_CORE_DIR)/HuffmanCode_asm_x64.o \
+#	$(UTV_CORE_DIR)/Predict_asm_x64.o
+#endif
+
 %.a:
 	$(AR) rcu $@ $^
 	$(RANLIB) $@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/utvideo.git/commitdiff/d0dcda3d769d98067079c974af3ccf349a4f57dc