diff options
| -rw-r--r-- | Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -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 |