Move libpng file into app, rather than the libskia, so it doesn't get optimized
away git-svn-id: http://skia.googlecode.com/svn/trunk@81 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
64dbab7e05
commit
fb21016338
8
Makefile
8
Makefile
@ -45,15 +45,12 @@ ifeq ($(SKIA_BUILD_FOR),mac)
|
||||
SRC_LIST += src/ports/SkImageDecoder_CG.cpp
|
||||
SRC_LIST += src/utils/mac/SkCreateCGImageRef.cpp
|
||||
else
|
||||
LINKER_OPTS += -lpng -ljpeg
|
||||
LINKER_OPTS += -lpng
|
||||
DEFINES += -DSK_BUILD_FOR_UNIX
|
||||
|
||||
# these are our registry-based factories
|
||||
SRC_LIST += src/images/SkImageDecoder_Factory.cpp
|
||||
SRC_LIST += src/images/SkImageEncoder_Factory.cpp
|
||||
# this is our list of optional codecs
|
||||
SRC_LIST += src/images/SkImageDecoder_libpng.cpp
|
||||
SRC_LIST += src/images/SkImageDecoder_libjpeg.cpp
|
||||
# support files
|
||||
SRC_LIST += src/images/SkScaledBitmapSampler.cpp
|
||||
endif
|
||||
@ -73,6 +70,9 @@ out/libskia.a: Makefile $(OBJ_LIST)
|
||||
|
||||
BENCH_SRCS := RectBench.cpp SkBenchmark.cpp main.cpp
|
||||
BENCH_SRCS := $(addprefix bench/, $(BENCH_SRCS))
|
||||
# add any optional codecs for this app
|
||||
BENCH_SRCS += src/images/SkImageDecoder_libpng.cpp
|
||||
|
||||
BENCH_OBJS := $(BENCH_SRCS:.cpp=.o)
|
||||
BENCH_OBJS := $(addprefix out/, $(BENCH_OBJS))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user