commit 4aa910ea938ddcfe1a480884a51aefe14d74ca89
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 30 18:50:23 2009 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 30 18:50:23 2009 +0000
tree d2ed8816c166590874f64d627eda0d8805465cec
parent 3f2025fdb5fc0bd8b1edc92174f0df5226942f8a

Makefile fix:  Fix gm build for Linux.
Also add a rule to build assembly files from .cpp's.

http://codereview.appspot.com/143060



git-svn-id: http://skia.googlecode.com/svn/trunk@413 2bbb7eff-a529-9590-31e7-b0007b416f81

Makefile

diff --git a/Makefile b/Makefile
index 106a620..0bf702c 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,10 @@
 	$(HIDE)$(CC) $(C_INCLUDES) $(CFLAGS) $(DEFINES) -c $< -o $@
 	@echo "compiling $@"
     
+%.s : %.cpp
+	@mkdir -p $(dir $@)
+	$(CC) $(C_INCLUDES) $(CFLAGS) $(DEFINES) -S -c $< -o $@
+
 # now build out objects
 OBJ_LIST := $(SRC_LIST:.cpp=.o)
 OBJ_LIST := $(addprefix out/, $(OBJ_LIST))
@@ -146,6 +150,10 @@
 include gm/gm_files.mk
 GM_SRCS := $(addprefix gm/, $(SOURCE))
 
+ifneq ($(SKIA_BUILD_FOR),mac)
+    GM_SRCS += src/images/SkImageDecoder_libpng.cpp
+endif
+
 GM_OBJS := $(GM_SRCS:.cpp=.o)
 GM_OBJS := $(addprefix out/, $(GM_OBJS))