diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-10 19:07:56 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-10 19:07:56 +0000 |
| commit | 072ee7d45cd0ee62c3fc2998072b78198c25984e (patch) | |
| tree | c3281b3fb97d4b0db96c97c6ae1dc97f53164067 /gyp_skia | |
| parent | e4dbe21bd9f48dfbac9f3510737105c67beb7dc2 (diff) | |
Allow use of SKIA_OUT on Windows
This works as expected, except that %SKIA_OUT% must be on the same drive
R=djsollen@google.com
Review URL: https://codereview.chromium.org/18467010
git-svn-id: http://skia.googlecode.com/svn/trunk@9972 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp_skia')
| -rwxr-xr-x | gyp_skia | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -62,12 +62,10 @@ def get_output_dir(): if not output_dir: return os.path.join(os.path.abspath(script_dir), 'out') - if (os.name != 'posix' or - (sys.platform.startswith('darwin') and + if (sys.platform.startswith('darwin') and (not os.getenv('GYP_GENERATORS') or - 'make' not in os.getenv('GYP_GENERATORS')))): - print 'ERROR: variable SKIA_OUT is not valid on Mac (using xcodebuild)' \ - ' or Windows' + 'make' not in os.getenv('GYP_GENERATORS'))): + print 'ERROR: variable SKIA_OUT is not valid on Mac (using xcodebuild)' sys.exit(-1); if os.path.isabs(output_dir): |