aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-10 19:45:51 +0000
committerGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-10 19:45:51 +0000
commitefb1d77ad2cb77f6b124b0674fccf67d9b737b60 (patch)
tree34209d9abb822ee4725b2fb83d783f57f7d40777 /Makefile
parent6293820c96ac1cf6f33377fb510549bf6a4f9ed6 (diff)
Build Skia as a static library
- Roll GYP so that we get non-thin archives on Linux - Add merge_static_libs.py - Add skia_core_lib target which builds core, ports, opts*, and utils - Replace dependencies on core/ports/opts/utils with skia_core_libs - Rename exportable libraries with "skia_" Review URL: https://codereview.appspot.com/6619049 git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4de8bc6f66..aa144100ba 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,12 @@
BUILDTYPE ?= Debug
CWD := $(shell pwd)
-ALL_TARGETS := core SampleApp bench gm tests tools
+ALL_TARGETS := skia_base_libs \
+ bench \
+ gm \
+ SampleApp \
+ tests \
+ tools
ifneq (,$(findstring skia_os=android, $(GYP_DEFINES)))
ifeq (,$(findstring android_make_apk=0, $(GYP_DEFINES)))