diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-31 19:02:37 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-31 19:02:37 +0000 |
| commit | 51c078b12a8f1fd5cb637925443efdb8b058d2d2 (patch) | |
| tree | 272e2361e3a5afb3af40529caf18a7cfa89ae03b /gyp | |
| parent | d897bfb76f7e19c6fa9bd015a7bbd28a9161f5e5 (diff) | |
make this work again: ./gyp_skia && make SampleApp
see http://codereview.appspot.com/4517123/
git-svn-id: http://skia.googlecode.com/svn/trunk@1454 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 2 | ||||
| -rw-r--r-- | gyp/all.gyp | 18 | ||||
| -rw-r--r-- | gyp/core.gyp (renamed from gyp/skia.gyp) | 3 | ||||
| -rwxr-xr-x | gyp/gyp_skia | 6 |
4 files changed, 24 insertions, 5 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 24f9963101..221e1dab2b 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -116,7 +116,7 @@ '../samplecode/SampleFontCache.cpp', ], 'dependencies': [ - 'skia.gyp:skia', + 'core.gyp:core', 'effects.gyp:effects', 'images.gyp:images', 'views.gyp:views', diff --git a/gyp/all.gyp b/gyp/all.gyp new file mode 100644 index 0000000000..58c0419bc2 --- /dev/null +++ b/gyp/all.gyp @@ -0,0 +1,18 @@ +# Creates a Makefile that is capable of building all executable targets. +{ + 'targets': [ + { + 'target_name': 'all', + 'type': 'none', + 'dependencies': [ + 'SampleApp.gyp:SampleApp' + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/skia.gyp b/gyp/core.gyp index c3cc4b4fff..43630d710e 100644 --- a/gyp/skia.gyp +++ b/gyp/core.gyp @@ -1,10 +1,11 @@ +# Core Skia library code. { 'includes': [ 'target_defaults.gypi', ], 'targets': [ { - 'target_name': 'skia', + 'target_name': 'core', 'type': 'static_library', 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', 'sources': [ diff --git a/gyp/gyp_skia b/gyp/gyp_skia index 72b4879457..f22b363073 100755 --- a/gyp/gyp_skia +++ b/gyp/gyp_skia @@ -15,7 +15,7 @@ # limitations under the License. # This script is a wrapper which invokes gyp with the correct --depth argument, -# and supports the automatic regeneration of build files if skia.gyp is +# and supports the automatic regeneration of build files if all.gyp is # changed (Linux-only). import glob @@ -61,10 +61,10 @@ if __name__ == '__main__': gyp_file_specified = True break - # If we didn't get a file, then fall back to assuming 'skia.gyp' from the + # If we didn't get a file, then fall back to assuming 'all.gyp' from the # same directory as the script. if not gyp_file_specified: - args.append(os.path.join(script_dir, 'skia.gyp')) + args.append(os.path.join(script_dir, 'all.gyp')) args.extend(['-I' + i for i in additional_include_files(args)]) |