| OLD | NEW |
| 1 # | 1 # |
| 2 # Copyright 2013 Google Inc. | 2 # Copyright 2013 Google Inc. |
| 3 # | 3 # |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 # | 6 # |
| 7 | 7 |
| 8 { | 8 { |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 '../third_party/lua/src/', | 52 '../third_party/lua/src/', |
| 53 ], | 53 ], |
| 54 'all_dependent_settings': { | 54 'all_dependent_settings': { |
| 55 'include_dirs': [ | 55 'include_dirs': [ |
| 56 '../third_party/lua/src/', | 56 '../third_party/lua/src/', |
| 57 ], | 57 ], |
| 58 }, | 58 }, |
| 59 'defines': [ | 59 'defines': [ |
| 60 "getlocaledecpoint()='.'", | 60 "getlocaledecpoint()='.'", |
| 61 ], | 61 ], |
| 62 'cflags': [ | 62 'variables': { |
| 63 '-Wno-parentheses-equality', | 63 'skia_lua_flags' : [ |
| 64 '-Wno-pointer-bool-conversion', | |
| 65 ], | |
| 66 'xcode_settings': { | |
| 67 'WARNING_CFLAGS': [ | |
| 68 '-Wno-parentheses-equality', | 64 '-Wno-parentheses-equality', |
| 69 '-Wno-pointer-bool-conversion', | 65 '-Wno-pointer-bool-conversion', |
| 66 '-Wno-array-bounds', |
| 70 ], | 67 ], |
| 71 }, | 68 }, |
| 69 'cflags': [ '<@(skia_lua_flags)' ], |
| 70 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_lua_flags)' ], }, |
| 72 'conditions': [ | 71 'conditions': [ |
| 73 ['skia_os != "win"', | 72 ['skia_os != "win"', |
| 74 { | 73 { |
| 75 'defines': [ | 74 'defines': [ |
| 76 'LUA_USE_POSIX', # Fix warning re dangerous tmpnam. | 75 'LUA_USE_POSIX', # Fix warning re dangerous tmpnam. |
| 77 ], | 76 ], |
| 78 } | 77 } |
| 79 ], | 78 ], |
| 80 [ 'skia_clang_build == 1', { | 79 [ 'skia_clang_build == 1', { |
| 81 'cflags':[ | 80 'cflags':[ |
| 82 '-w', | 81 '-w', |
| 83 ], | 82 ], |
| 84 }], | 83 }], |
| 85 ], | 84 ], |
| 86 }, | 85 }, |
| 87 ], | 86 ], |
| 88 } | 87 } |
| OLD | NEW |