diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-04-14 14:28:22 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-04-14 14:28:22 +0000 |
| commit | 9781ca586618cc8ea055f54021e706824313d4f5 (patch) | |
| tree | 2d6d4dffba13e109d846a049d21c0239f4acbf8f /Makefile | |
| parent | fc3ac327d8e041e11049d7f0dfc7f491590cda75 (diff) | |
add SkSfntUtils to parse some known truetype tables
add comments and cleanup to count_tables in SkFontHost_tables.cpp
fix transparency bug in gifs
use (alpha+1) for blending in srcover mode, to ensure opaque results
git-svn-id: http://skia.googlecode.com/svn/trunk@155 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -36,6 +36,13 @@ SRC_LIST += $(addprefix src/effects/, $(SOURCE)) include src/images/images_files.mk SRC_LIST += $(addprefix src/images/, $(SOURCE)) +# core util files +include src/utils/utils_files.mk +SRC_LIST += $(addprefix src/utils/, $(SOURCE)) + +# extra files we want to build to prevent bit-rot, but not link +JUST_COMPILE_LIST := src/ports/SkFontHost_tables.cpp + # conditional files based on our platform ifeq ($(SKIA_BUILD_FOR),mac) LINKER_OPTS += -framework Carbon @@ -65,7 +72,11 @@ out/%.o : %.cpp OBJ_LIST := $(SRC_LIST:.cpp=.o) OBJ_LIST := $(addprefix out/, $(OBJ_LIST)) -out/libskia.a: Makefile $(OBJ_LIST) +# we want to compile these, but we don't actually link them +JUST_COMPILE_OBJS := $(JUST_COMPILE_LIST:.cpp=.o) +JUST_COMPILE_OBJS := $(addprefix out/, $(JUST_COMPILE_OBJS)) + +out/libskia.a: Makefile $(OBJ_LIST) $(JUST_COMPILE_OBJS) $(HIDE)$(AR) ru $@ $(OBJ_LIST) $(HIDE)ranlib $@ |