Updated include directories and file names to Makefile

This commit is contained in:
Ari Lemmetti 2014-07-22 15:36:54 +03:00
parent 4f88ebce5a
commit bd6e89c1f0

View file

@ -56,8 +56,10 @@ endif
# Do not use variable length arrays because they don't work in Visual Studio 2013. # Do not use variable length arrays because they don't work in Visual Studio 2013.
WARNINGS = -Wall -Wtype-limits -Wvla WARNINGS = -Wall -Wtype-limits -Wvla
INCLUDEDIRS = -I. -I./strategies -I./extras
CC = gcc CC = gcc
CCFLAGS = $(DFLAGS) -std=gnu99 -I. -I./strategies $(WARNINGS) CCFLAGS = $(DFLAGS) -std=gnu99 $(INCLUDEDIRS) $(WARNINGS)
LDFLAGS += -lm LDFLAGS += -lm
LD = gcc -pthread -lrt LD = gcc -pthread -lrt
OBJS = interface_main.o \ OBJS = interface_main.o \
@ -96,12 +98,15 @@ OBJS = interface_main.o \
strategies/sse41/picture-sse41.o \ strategies/sse41/picture-sse41.o \
strategies/altivec/picture-altivec.o \ strategies/altivec/picture-altivec.o \
strategies/avx2/picture-avx2.o \ strategies/avx2/picture-avx2.o \
strategies/x86_avx/picture-avx.o strategies/x86_asm/picture-x86-asm.o
ASMFLAGS += $(INCLUDEDIRS)
ASMOBJS = ASMOBJS =
ifeq ($(TARGET_CPU_ARCH), x86) ifeq ($(TARGET_CPU_ARCH), x86)
ifneq ($(KVAZAAR_DISABLE_YASM), 1) ifneq ($(KVAZAAR_DISABLE_YASM), 1)
ASMOBJS += strategies/x86_avx/picture_x86.o ASMOBJS += strategies/x86_asm/picture-x86-asm-sad.o
ASMOBJS += strategies/x86_asm/picture-x86-asm-satd.o
endif endif
endif endif