AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile fix: Fix gm build for Linux.

Browse Source 
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
This commit is contained in:
senorblanco@chromium.org 2009-10-30 18:50:23 +00:00
parent 3f2025fdb5
commit 4aa910ea93
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -81,6 +81,10 @@ out/%.o : %.cpp
$(HIDE)$(CC) $(C_INCLUDES) $(CFLAGS) $(DEFINES) -c $< -o $@ $(HIDE)$(CC) $(C_INCLUDES) $(CFLAGS) $(DEFINES) -c $< -o $@
@echo "compiling $@" @echo "compiling $@"
%.s : %.cpp
@mkdir -p $(dir $@)
$(CC) $(C_INCLUDES) $(CFLAGS) $(DEFINES) -S -c $< -o $@
# now build out objects # now build out objects
OBJ_LIST := $(SRC_LIST:.cpp=.o) OBJ_LIST := $(SRC_LIST:.cpp=.o)
OBJ_LIST := $(addprefix out/, $(OBJ_LIST)) OBJ_LIST := $(addprefix out/, $(OBJ_LIST))
@ -146,6 +150,10 @@ skimage: $(SKIMAGE_OBJS) out/libskia.a
include gm/gm_files.mk include gm/gm_files.mk
GM_SRCS := $(addprefix gm/, $(SOURCE)) 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 := $(GM_SRCS:.cpp=.o)
GM_OBJS := $(addprefix out/, $(GM_OBJS)) GM_OBJS := $(addprefix out/, $(GM_OBJS))