From 7876114a79df10c8418cc45e6944aef8a032aafd Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 23 Dec 2010 16:34:58 +0000 Subject: [PATCH] require lpng12 for gm tool (since Mac encoder tweaks the results for colorspace "correction") update baselines using png git-svn-id: http://skia.googlecode.com/svn/trunk@657 2bbb7eff-a529-9590-31e7-b0007b416f81 --- Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0c6b17ff52..0537fe3f67 100644 --- a/Makefile +++ b/Makefile @@ -80,14 +80,22 @@ ifeq ($(SKIA_BUILD_FOR),mac) # SDK_OPTS := -isysroot $(SDK) -mmacosx-version-min=10.4 # CC := gcc-4.0 $(SDK_OPTS) - LINKER_OPTS += -framework Carbon - DEFINES += -DSK_BUILD_FOR_MAC + C_INCLUDES += -I/opt/local/include + LINKER_OPTS += -L/opt/local/lib -framework Carbon -lpng12 + DEFINES += -DSK_BUILD_FOR_MAC -DSK_ENABLE_LIBPNG C_INCLUDES += -Iinclude/utils/mac - SRC_LIST += src/ports/SkImageDecoder_CG.cpp - SRC_LIST += src/utils/mac/SkCreateCGImageRef.cpp +# SRC_LIST += src/ports/SkImageDecoder_CG.cpp +# SRC_LIST += src/utils/mac/SkCreateCGImageRef.cpp SRC_LIST += src/utils/mac/SkEGLContext_mac.cpp SRC_LIST += src/ports/SkFontHost_mac_coretext.cpp + + # these are our registry-based factories + SRC_LIST += src/images/SkImageDecoder_Factory.cpp + SRC_LIST += src/images/SkImageEncoder_Factory.cpp + SRC_LIST += src/images/SkImageDecoder_libpng.cpp + # support files + SRC_LIST += src/images/SkScaledBitmapSampler.cpp else LINKER_OPTS += -lpng -lfreetype DEFINES += -DSK_BUILD_FOR_UNIX -DSK_ENABLE_LIBPNG