fix gyp-generated xcode project files for SampleApp and other targets
see http://codereview.appspot.com/4515181/
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1482 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core.gyp b/core.gyp
index 3c207a9..c0d8944 100644
--- a/core.gyp
+++ b/core.gyp
@@ -289,8 +289,14 @@
'../src/ports/SkThread_pthread.cpp',
'../src/ports/SkTime_Unix.cpp',
+ # TODO(epoger): why are we building this here?
'../src/utils/mac/SkCreateCGImageRef.cpp',
],
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+ ],
+ },
}],
[ 'OS == "win"', {
'include_dirs': [
diff --git a/utils.gyp b/utils.gyp
index 02c5da1..bde4368 100644
--- a/utils.gyp
+++ b/utils.gyp
@@ -10,6 +10,7 @@
'../include/config',
'../include/core',
'../include/utils',
+ '../include/utils/mac',
'../include/utils/unix',
'../include/views',
'../include/effects',
@@ -57,7 +58,6 @@
'../src/utils/SkUnitMappers.cpp',
'../include/utils/mac/SkCGUtils.h',
- '../src/utils/mac/SkBitmap_Mac.cpp',
'../src/utils/mac/SkCreateCGImageRef.cpp',
'../src/utils/mac/SkEGLContext_mac.cpp',
'../src/utils/mac/skia_mac.cpp',
@@ -83,12 +83,14 @@
[ 'OS != "mac"', {
'sources!': [
'../include/utils/mac/SkCGUtils.h',
- '../src/utils/mac/SkBitmap_Mac.cpp',
'../src/utils/mac/SkCreateCGImageRef.cpp',
'../src/utils/mac/SkEGLContext_mac.cpp',
'../src/utils/mac/skia_mac.cpp',
'../src/utils/mac/SkOSWindow_Mac.cpp',
],
+ 'include_dirs!': [
+ '../include/utils/mac',
+ ],
}],
[ 'OS == "mac"', {
'sources!': [
diff --git a/views.gyp b/views.gyp
index 4e9b19f..02059a4 100644
--- a/views.gyp
+++ b/views.gyp
@@ -80,14 +80,18 @@
],
}],
[ 'OS == "mac"', {
+ # TODO(epoger): why are we building these here instead of inheriting
+ # them from utils.gyp?
'sources': [
'../include/utils/SkCGUtils.h',
- #'../src/utils/mac/SkBitmap_Mac.cpp',
'../src/utils/mac/SkCreateCGImageRef.cpp',
'../src/utils/mac/SkEGLContext_mac.cpp',
'../src/utils/mac/skia_mac.cpp',
'../src/utils/mac/SkOSWindow_Mac.cpp',
],
+ 'include_dirs': [
+ '../include/utils/mac',
+ ],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',