aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2010-04-12 14:27:37 +0000
committerGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2010-04-12 14:27:37 +0000
commit6413e79414b4a8e4111cfd4c35959d10d9312440 (patch)
tree783281f11d902dd71adf1e04bde07f63c5aa886a /Makefile
parenta956e4fe2e7a6701f778c632ff11e8a0ed01168f (diff)
add skhello for simple hello-world sample code
git-svn-id: http://skia.googlecode.com/svn/trunk@539 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 15 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7973c25a94..a0027ee102 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,19 @@ skimage: $(SKIMAGE_OBJS) out/libskia.a
##############################################################################
+SKHELLO_SRCS := skhello.cpp
+
+SKHELLO_SRCS := $(addprefix tools/, $(SKHELLO_SRCS))
+
+SKHELLO_OBJS := $(SKHELLO_SRCS:.cpp=.o)
+SKHELLO_OBJS := $(addprefix out/, $(SKHELLO_OBJS))
+
+skhello: $(SKHELLO_OBJS) out/libskia.a
+ @echo "linking shkello..."
+ $(HIDE)g++ $(SKHELLO_OBJS) out/libskia.a -o out/tools/skhello $(LINKER_OPTS)
+
+##############################################################################
+
include gm/gm_files.mk
GM_SRCS := $(addprefix gm/, $(SOURCE))
@@ -170,7 +183,7 @@ gm: $(GM_OBJS) out/libskia.a
##############################################################################
.PHONY: all
-all: $ bench gm skimage tests
+all: $ bench gm skimage tests skhello
.PHONY: clean
clean:
@@ -183,6 +196,7 @@ help:
@echo " bench: out/bench/bench"
@echo " gm: out/gm/gm"
@echo " skimage: out/tools/skimage"
+ @echo " skhello: out/tools/skhello"
@echo " tests: out/tests/tests"
@echo " clean: removes entire out/ directory"
@echo " help: this text"