| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # | 2 # |
| 3 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 3 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 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 # TODO(sehr): remove need for the warning flag removals below | 8 # TODO(sehr): remove need for the warning flag removals below |
| 9 { | 9 { |
| 10 'includes': [ | 10 'includes': [ |
| 11 # NOTE: this file also defines common dependencies. | 11 # NOTE: this file also defines common dependencies. |
| 12 'nonnacl_util.gypi', | 12 'nonnacl_util.gypi', |
| 13 ], | 13 ], |
| 14 'target_defaults': { | 14 'target_defaults': { |
| 15 'variables': { | 15 'variables': { |
| 16 'target_base': 'none', | 16 'target_base': 'none', |
| 17 }, | 17 }, |
| 18 'include_dirs': [ |
| 19 '<(DEPTH)/ppapi', |
| 20 ], |
| 18 'target_conditions': [ | 21 'target_conditions': [ |
| 19 ['target_base=="sel_ldr_launcher"', { | 22 ['target_base=="sel_ldr_launcher"', { |
| 20 'sources': [ | 23 'sources': [ |
| 21 'sel_ldr_launcher.cc', | 24 'sel_ldr_launcher.cc', |
| 22 'sel_ldr_launcher.h', | 25 'sel_ldr_launcher.h', |
| 23 'sel_ldr_launcher_chrome.cc', | 26 'sel_ldr_launcher_chrome.cc', |
| 24 ], | 27 ], |
| 25 'cflags!': [ | 28 'cflags!': [ |
| 26 '-Wextra', | 29 '-Wextra', |
| 27 ], | 30 ], |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 # env.Append( | 153 # env.Append( |
| 151 # CCFLAGS=['-fPIC'], | 154 # CCFLAGS=['-fPIC'], |
| 152 # ) | 155 # ) |
| 153 #if env.Bit('mac'): | 156 #if env.Bit('mac'): |
| 154 # # there are some issue with compiling ".mm" files | 157 # # there are some issue with compiling ".mm" files |
| 155 # env.FilterOut(CCFLAGS=['-pedantic']) | 158 # env.FilterOut(CCFLAGS=['-pedantic']) |
| 156 #if env.Bit('windows'): | 159 #if env.Bit('windows'): |
| 157 # env.Append( | 160 # env.Append( |
| 158 # CPPDEFINES = ['XP_WIN', 'WIN32', '_WINDOWS'], | 161 # CPPDEFINES = ['XP_WIN', 'WIN32', '_WINDOWS'], |
| 159 # ) | 162 # ) |
| OLD | NEW |