aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-09-28 16:12:48 +0000
committerGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-09-28 16:12:48 +0000
commitf2afb67bab01062d2632543c1f004b166bf01e31 (patch)
treef9bb89b815512564b28326c44cf6e89ed16bd51a /Makefile
parent2a645c9e325714e364e527950097eae697b10820 (diff)
fix base linux build, adding freetype support
git-svn-id: http://skia.googlecode.com/svn/trunk@371 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dff3457b4f..106a6206f3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# setup our defaults
CC := gcc
C_INCLUDES := -Iinclude/config -Iinclude/core -Iinclude/effects -Iinclude/images -Iinclude/utils
-CFLAGS := -Wall # -O2
+CFLAGS := -Wall -g # -O2
LINKER_OPTS := -lpthread
DEFINES := -DSK_CAN_USE_FLOAT
HIDE = @
@@ -59,10 +59,16 @@ ifeq ($(SKIA_BUILD_FOR),mac)
SRC_LIST += src/utils/mac/SkCreateCGImageRef.cpp
SRC_LIST += src/ports/SkFontHost_mac.cpp
else
- LINKER_OPTS += -lpng
+ LINKER_OPTS += -lpng -lfreetype
DEFINES += -DSK_BUILD_FOR_UNIX
- SRC_LIST += src/ports/SkFontHost_none.cpp
+ # needed for freetype support
+ C_INCLUDES += -I/usr/include/freetype2
+ SRC_LIST += src/ports/SkFontHost_linux.cpp
+ SRC_LIST += src/ports/SkFontHost_gamma_none.cpp
+ SRC_LIST += src/ports/SkFontHost_FreeType.cpp
+ SRC_LIST += src/ports/SkFontHost_FreeType_Subpixel.cpp
+ SRC_LIST += src/utils/SkOSFile.cpp
# these are our registry-based factories
SRC_LIST += src/images/SkImageDecoder_Factory.cpp
SRC_LIST += src/images/SkImageEncoder_Factory.cpp