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

require lpng12 for gm tool (since Mac encoder tweaks the results for colorspace "correction")

Browse Source 
update baselines using png



git-svn-id: http://skia.googlecode.com/svn/trunk@657 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2010-12-23 16:34:58 +00:00
parent ef152364cb
commit 7876114a79
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -80,14 +80,22 @@ ifeq ($(SKIA_BUILD_FOR),mac)
# SDK_OPTS := -isysroot $(SDK) -mmacosx-version-min=10.4 # SDK_OPTS := -isysroot $(SDK) -mmacosx-version-min=10.4
# CC := gcc-4.0 $(SDK_OPTS) # CC := gcc-4.0 $(SDK_OPTS)
LINKER_OPTS += -framework Carbon C_INCLUDES += -I/opt/local/include
DEFINES += -DSK_BUILD_FOR_MAC LINKER_OPTS += -L/opt/local/lib -framework Carbon -lpng12
DEFINES += -DSK_BUILD_FOR_MAC -DSK_ENABLE_LIBPNG
C_INCLUDES += -Iinclude/utils/mac C_INCLUDES += -Iinclude/utils/mac
SRC_LIST += src/ports/SkImageDecoder_CG.cpp # SRC_LIST += src/ports/SkImageDecoder_CG.cpp
SRC_LIST += src/utils/mac/SkCreateCGImageRef.cpp # SRC_LIST += src/utils/mac/SkCreateCGImageRef.cpp
SRC_LIST += src/utils/mac/SkEGLContext_mac.cpp SRC_LIST += src/utils/mac/SkEGLContext_mac.cpp
SRC_LIST += src/ports/SkFontHost_mac_coretext.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 else
LINKER_OPTS += -lpng -lfreetype LINKER_OPTS += -lpng -lfreetype
DEFINES += -DSK_BUILD_FOR_UNIX -DSK_ENABLE_LIBPNG DEFINES += -DSK_BUILD_FOR_UNIX -DSK_ENABLE_LIBPNG