]>
Commit | Line | Data |
---|---|---|
da2db957 JB |
1 | --- utvideo-12.0.1/GNUmakefile.orig 2011-11-08 03:18:38.000000000 +0100 |
2 | +++ utvideo-12.0.1/GNUmakefile 2013-01-18 19:43:42.962655943 +0100 | |
3 | @@ -34,7 +34,6 @@ | |
4 | OBJ = $(UTV_CORE_DIR)/Codec.o \ | |
5 | $(UTV_CORE_DIR)/Convert.o \ | |
6 | $(UTV_CORE_DIR)/DummyCodec.o \ | |
7 | - $(UTV_CORE_DIR)/Format.o \ | |
8 | $(UTV_CORE_DIR)/FrameBuffer.o \ | |
9 | $(UTV_CORE_DIR)/GlobalConfig.o \ | |
10 | $(UTV_CORE_DIR)/HuffmanCode.o \ | |
11 | @@ -48,6 +47,20 @@ | |
12 | $(UTV_CORE_DIR)/ULY2Codec.o \ | |
13 | $(UTV_CORE_DIR)/utv_core.o | |
14 | ||
15 | +ifeq ($(ARCH),i386) | |
16 | +OBJ+=$(UTV_CORE_DIR)/TunedFunc_x86.o \ | |
17 | + $(UTV_CORE_DIR)/Convert_asm_x86.o \ | |
18 | + $(UTV_CORE_DIR)/HuffmanCode_asm_x86.o \ | |
19 | + $(UTV_CORE_DIR)/Predict_asm_x86.o | |
20 | +endif | |
21 | +# note: TunedFunc_x64.cpp supports only MSC | |
22 | +#ifeq ($(ARCH),x86_64) | |
23 | +#OBJ+=$(UTV_CORE_DIR)/TunedFunc_x64.o \ | |
24 | +# $(UTV_CORE_DIR)/Convert_asm_x64.o \ | |
25 | +# $(UTV_CORE_DIR)/HuffmanCode_asm_x64.o \ | |
26 | +# $(UTV_CORE_DIR)/Predict_asm_x64.o | |
27 | +#endif | |
28 | + | |
29 | %.a: | |
30 | $(AR) rcu $@ $^ | |
31 | $(RANLIB) $@ |