diff options
| author |  yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-08 18:38:58 +0000 |
|---|---|---|
| committer | yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-08 18:38:58 +0000 |
| commit | 42fd1e94bbc43ddb28df39c64efaf1883e303c4e (patch) | |
| tree | e77d70a28da7454c30f9f8aa4b53410b398e6247 /gyp | |
| parent | c71174da7aa45de5efc60cf8fb26789f2d690f3e (diff) | |
CocoaSampleApp no longer depends on SkOSWindow_Mac.h
./gyp_skia now builds CocoaSampleApp on Mac
http://codereview.appspot.com/4810084/
git-svn-id: http://skia.googlecode.com/svn/trunk@2063 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/CocoaSampleApp.gyp | 11 | ||||
| -rw-r--r-- | gyp/SampleApp.gyp | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gyp/CocoaSampleApp.gyp b/gyp/CocoaSampleApp.gyp index d55f220b62..17cda68f9d 100644 --- a/gyp/CocoaSampleApp.gyp +++ b/gyp/CocoaSampleApp.gyp @@ -1,4 +1,3 @@ - { 'includes': [ 'common.gypi', @@ -180,12 +179,14 @@ '../experimental/CocoaSampleApp/SkNSView.mm', '../experimental/CocoaSampleApp/SkOptionsTableView.h', '../experimental/CocoaSampleApp/SkOptionsTableView.mm', - '../experimental/CocoaSampleApp/SkOSWindow_Mac.h', - '../experimental/CocoaSampleApp/SkOSWindow_Mac.mm', '../experimental/CocoaSampleApp/SkTextFieldCell.h', '../experimental/CocoaSampleApp/SkTextFieldCell.m', '../experimental/SkEventNotifier.h', '../experimental/SkEventNotifier.mm', + + # Cocoa versions of SkOSWindow for Mac + '../include/views/SkOSWindow_Mac_Cocoa.h', + '../src/utils/mac/SkOSWindow_Mac_Cocoa.mm', ], 'link_settings': { 'libraries': [ @@ -201,6 +202,10 @@ }, 'xcode_settings' : { 'INFOPLIST_FILE' : '../experimental/CocoaSampleApp/SampleApp-Info.plist', + + # Define the compiler flag using the following line to use Cocoa + # To be removed when SampleApp is ready to move to Cocoa + 'GCC_PREPROCESSOR_DEFINITIONS' : 'Sk_MAC_COCOA', }, 'mac_bundle_resources' : [ '../experimental/CocoaSampleApp/SampleApp.xib', diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 23e81ba19a..2dbafa8d63 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -161,6 +161,10 @@ '../src/utils/mac/skia_mac.cpp', '../src/utils/mac/SkOSWindow_Mac.cpp', ], + 'dependencies': [ + # Build Cocoa version of SampleApp + 'CocoaSampleApp.gyp:CocoaSampleApp', + ], }], [ 'skia_os == "ios"', { # TODO: This doesn't build properly yet, but it's getting there. |