diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-21 19:51:57 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-21 19:51:57 +0000 |
| commit | 918261018f7a7754a5e7f0fbb6ec96f9b269fd26 (patch) | |
| tree | 3b604735d28f1bb5eea66c81df6d944712e0f20b /gyp/skia.gyp | |
| parent | e6507632c15ddd05c5e7a51f41b94b6208f3ab25 (diff) | |
Add GR_DLL builds to Ganesh (minimal exports for Chrome multi-dll for now).
Review URL: http://codereview.appspot.com/4301044/
git-svn-id: http://skia.googlecode.com/svn/trunk@970 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/skia.gyp')
| -rw-r--r-- | gyp/skia.gyp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gyp/skia.gyp b/gyp/skia.gyp index e50122d878..53ea83b77d 100644 --- a/gyp/skia.gyp +++ b/gyp/skia.gyp @@ -300,7 +300,7 @@ 'libraries': [ '-lfreetype', ], - }, + }, }], [ 'OS == "mac"', { 'include_dirs': [ @@ -932,6 +932,9 @@ '../gpu/src/GrTextureCache.cpp', '../gpu/src/gr_unittests.cpp', ], + 'defines': [ + 'GR_IMPLEMENTATION=1', + ], 'conditions': [ [ 'OS == "linux"', { 'defines': [ @@ -942,7 +945,7 @@ '-lGL', '-lX11', ], - }, + }, }], [ 'OS == "mac"', { 'defines': [ @@ -952,7 +955,7 @@ 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], - }, + }, }], [ 'OS == "win"', { 'defines': [ @@ -1015,7 +1018,7 @@ '../src/animator/SkAnimatorScript.cpp', '../src/animator/SkAnimatorScript.h', #'../src/animator/SkAnimatorScript2.cpp', fails on windows - #'../src/animator/SkAnimatorScript2.h', + #'../src/animator/SkAnimatorScript2.h', '../src/animator/SkBase64.cpp', '../src/animator/SkBase64.h', '../src/animator/SkBoundable.cpp', |