Merge "Android.mk & Makefile.vc: add new files"

This commit is contained in:
James Zern 2012-04-11 15:48:30 -07:00 committed by Gerrit Code Review
commit b3d35fc130
2 changed files with 8 additions and 0 deletions

View File

@ -11,11 +11,13 @@ LOCAL_SRC_FILES := \
src/dec/quant.c \ src/dec/quant.c \
src/dec/tree.c \ src/dec/tree.c \
src/dec/vp8.c \ src/dec/vp8.c \
src/dec/vp8l.c \
src/dec/webp.c \ src/dec/webp.c \
src/dsp/cpu.c \ src/dsp/cpu.c \
src/dsp/dec.c \ src/dsp/dec.c \
src/dsp/dec_neon.c \ src/dsp/dec_neon.c \
src/dsp/enc.c \ src/dsp/enc.c \
src/dsp/lossless.c \
src/dsp/upsampling.c \ src/dsp/upsampling.c \
src/dsp/yuv.c \ src/dsp/yuv.c \
src/enc/alpha.c \ src/enc/alpha.c \
@ -37,7 +39,9 @@ LOCAL_SRC_FILES := \
src/utils/alpha.c \ src/utils/alpha.c \
src/utils/bit_reader.c \ src/utils/bit_reader.c \
src/utils/bit_writer.c \ src/utils/bit_writer.c \
src/utils/color_cache.c \
src/utils/filters.c \ src/utils/filters.c \
src/utils/huffman.c \
src/utils/quant_levels.c \ src/utils/quant_levels.c \
src/utils/rescaler.c \ src/utils/rescaler.c \
src/utils/tcoder.c \ src/utils/tcoder.c \

View File

@ -158,12 +158,14 @@ X_OBJS= \
$(DIROBJ)\dec\quant.obj \ $(DIROBJ)\dec\quant.obj \
$(DIROBJ)\dec\tree.obj \ $(DIROBJ)\dec\tree.obj \
$(DIROBJ)\dec\vp8.obj \ $(DIROBJ)\dec\vp8.obj \
$(DIROBJ)\dec\vp8l.obj \
$(DIROBJ)\dec\webp.obj \ $(DIROBJ)\dec\webp.obj \
$(DIROBJ)\dsp\cpu.obj \ $(DIROBJ)\dsp\cpu.obj \
$(DIROBJ)\dsp\dec.obj \ $(DIROBJ)\dsp\dec.obj \
$(DIROBJ)\dsp\dec_sse2.obj \ $(DIROBJ)\dsp\dec_sse2.obj \
$(DIROBJ)\dsp\enc.obj \ $(DIROBJ)\dsp\enc.obj \
$(DIROBJ)\dsp\enc_sse2.obj \ $(DIROBJ)\dsp\enc_sse2.obj \
$(DIROBJ)\dsp\lossless.obj \
$(DIROBJ)\dsp\upsampling.obj \ $(DIROBJ)\dsp\upsampling.obj \
$(DIROBJ)\dsp\upsampling_sse2.obj \ $(DIROBJ)\dsp\upsampling_sse2.obj \
$(DIROBJ)\dsp\yuv.obj \ $(DIROBJ)\dsp\yuv.obj \
@ -186,7 +188,9 @@ X_OBJS= \
$(DIROBJ)\utils\alpha.obj \ $(DIROBJ)\utils\alpha.obj \
$(DIROBJ)\utils\bit_reader.obj \ $(DIROBJ)\utils\bit_reader.obj \
$(DIROBJ)\utils\bit_writer.obj \ $(DIROBJ)\utils\bit_writer.obj \
$(DIROBJ)\utils\color_cache.obj \
$(DIROBJ)\utils\filters.obj \ $(DIROBJ)\utils\filters.obj \
$(DIROBJ)\utils\huffman.obj \
$(DIROBJ)\utils\quant_levels.obj \ $(DIROBJ)\utils\quant_levels.obj \
$(DIROBJ)\utils\rescaler.obj \ $(DIROBJ)\utils\rescaler.obj \
$(DIROBJ)\utils\tcoder.obj \ $(DIROBJ)\utils\tcoder.obj \