diff options
| author |  yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 18:56:00 +0000 |
|---|---|---|
| committer | yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 18:56:00 +0000 |
| commit | 900d8772e30c329c25baff77098dfdd85fb8e94e (patch) | |
| tree | 74cb59a36dc75b2b1f72d3fc4309a5a9a5ee8208 | |
| parent | 57d73d628dad2e1a67532d7153603662ec91741d (diff) | |
Fixed include statements to correctly link mac/ios libraries
git-svn-id: http://skia.googlecode.com/svn/trunk@1712 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 1 | ||||
| -rw-r--r-- | src/ports/SkImageDecoder_CG.cpp | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index d9022246bd..e74a5cdb49 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -29,6 +29,7 @@ #ifdef SK_BUILD_FOR_IOS #include <CoreText/CoreText.h> #include <CoreGraphics/CoreGraphics.h> +#include <CoreFoundation/CoreFoundation.h> #endif namespace skia_advanced_typeface_metrics_utils { diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp index 0e8b95b843..dc9437fb81 100644 --- a/src/ports/SkImageDecoder_CG.cpp +++ b/src/ports/SkImageDecoder_CG.cpp @@ -20,13 +20,13 @@ #include "SkTemplates.h" #include "SkCGUtils.h" -//#ifdef SK_BUILD_FOR_MAC -//#include <ApplicationServices/ApplicationServices.h> -//#endif -// -//#ifdef SK_BUILD_FOR_IOS -//#include <CoreGraphics/CoreGraphics.h> -//#endif +#ifdef SK_BUILD_FOR_MAC +#include <ApplicationServices/ApplicationServices.h> +#endif + +#ifdef SK_BUILD_FOR_IOS +#include <CoreGraphics/CoreGraphics.h> +#endif static void malloc_release_proc(void* info, const void* data, size_t size) { sk_free(info); |