diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-23 20:20:51 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-23 20:20:51 +0000 |
| commit | 37df17d164bdb5a62fc6c2d2d9f1b59ee54587f7 (patch) | |
| tree | 335981e9b580afab36d451ff4320f3005f85aeef /Makefile | |
| parent | 51df9e3fe3c1aec370854b2718df16fc02faa1b2 (diff) | |
fix build for linux
partial impl for GPU on linux (need getProcAddress and SkEGLContext)
git-svn-id: http://skia.googlecode.com/svn/trunk@661 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -81,7 +81,7 @@ ifeq ($(SKIA_BUILD_FOR),mac) # CC := gcc-4.0 $(SDK_OPTS) C_INCLUDES += -I/opt/local/include - LINKER_OPTS += -L/opt/local/lib -framework Carbon -lpng12 + LINKER_OPTS += -L/opt/local/lib -framework Carbon -lpng12 -framework OpenGL -framework AGL DEFINES += -DSK_BUILD_FOR_MAC -DSK_ENABLE_LIBPNG C_INCLUDES += -Iinclude/utils/mac @@ -97,8 +97,8 @@ ifeq ($(SKIA_BUILD_FOR),mac) # support files SRC_LIST += src/images/SkScaledBitmapSampler.cpp else - LINKER_OPTS += -lpng -lfreetype - DEFINES += -DSK_BUILD_FOR_UNIX -DSK_ENABLE_LIBPNG + LINKER_OPTS += -lpng -lfreetype -lGL + DEFINES += -DSK_BUILD_FOR_UNIX -DSK_ENABLE_LIBPNG -DGR_LINUX_BUILD=1 # needed for freetype support C_INCLUDES += -I/usr/include/freetype2 @@ -107,6 +107,7 @@ else SRC_LIST += src/ports/SkFontHost_FreeType.cpp SRC_LIST += src/ports/SkFontHost_FreeType_Subpixel.cpp SRC_LIST += src/utils/SkOSFile.cpp + SRC_LIST += src/utils/SkEGLContext_none.cpp # these are our registry-based factories SRC_LIST += src/images/SkImageDecoder_Factory.cpp SRC_LIST += src/images/SkImageEncoder_Factory.cpp @@ -221,7 +222,7 @@ GM_OBJS := $(addprefix out/, $(GM_OBJS)) gm: $(GM_OBJS) out/libskia.a @echo "linking gm..." - $(HIDE)$(GPP) $(GM_OBJS) out/libskia.a -o out/gm/gm -framework OpenGL -framework AGL $(LINKER_OPTS) + $(HIDE)$(GPP) $(GM_OBJS) out/libskia.a -o out/gm/gm $(LINKER_OPTS) SAMPLEPDF_SRCS := samplepdf.cpp |