aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-01 16:15:43 +0000
committerGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-01 16:15:43 +0000
commit63aab2fecbad4f2085c5a52f8d8847bde1da4e8a (patch)
treeb47ea1fe6a0236c0062b0c61c816f5918d4cee80
parent7a9ad1b9862402c89ba18c3794d12353dcee29b4 (diff)
Fixup utils.gyp.
git-svn-id: http://skia.googlecode.com/svn/trunk@1466 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gyp/utils.gyp42
1 files changed, 35 insertions, 7 deletions
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 6356d73a92..2e5308b5e0 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -55,22 +55,50 @@
'../src/utils/SkSfntUtils.cpp',
'../src/utils/SkUnitMappers.cpp',
- '../src/utils/mac/SkEGLContext_Mesa.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',
+ '../src/utils/mac/SkOSWindow_Mac.cpp',
+
+ '../src/utils/mesa/SkEGLContext_Mesa.cpp',
+
+ '../src/utils/SDL/SkOSWindow_SDL.cpp',
+
+ '../src/utils/unix/keysym2ucs.c',
+ '../src/utils/unix/SkEGLContext_Unix.cpp',
+ '../src/utils/unix/SkOSWindow_Unix.cpp',
+
+ '../src/utils/win/skia_win.cpp',
+ '../src/utils/win/SkOSWindow_Win.cpp',
],
'sources!': [
- '../src/utils/mac/SkEGLContext_Mesa.cpp',
+ '../src/utils/mesa/SkEGLContext_Mesa.cpp',
+ '../src/utils/SDL/SkOSWindow_SDL.cpp',
],
'conditions': [
- [ 'OS == "mac"', {
- 'sources': [
- '../include/utils/SkCGUtils.h',
+ [ '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',
],
}],
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
- 'sources': [
+ [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', {
+ 'sources!': [
+ '../src/utils/unix/keysym2ucs.c',
'../src/utils/unix/SkEGLContext_Unix.cpp',
+ '../src/utils/unix/SkOSWindow_Unix.cpp',
+ ],
+ }],
+ [ 'OS != "win"', {
+ 'sources!': [
+ '../src/utils/win/skia_win.cpp',
+ '../src/utils/win/SkOSWindow_Win.cpp',
],
}],
],