OLD | NEW |
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 Import('env') | 5 Import('env') |
6 | 6 |
7 env = env.Clone() | 7 env = env.Clone() |
8 | 8 |
9 env.SConscript([ | 9 env.SConscript([ |
10 '$BREAKPAD_DIR/using_breakpad.scons', | 10 '$BREAKPAD_DIR/using_breakpad.scons', |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 'ipc_channel_posix.cc', | 277 'ipc_channel_posix.cc', |
278 ) | 278 ) |
279 | 279 |
280 if env.Bit('windows'): | 280 if env.Bit('windows'): |
281 input_files.Append( | 281 input_files.Append( |
282 'transport_dib_win.cc' | 282 'transport_dib_win.cc' |
283 ) | 283 ) |
284 | 284 |
285 if env.Bit('linux'): | 285 if env.Bit('linux'): |
286 input_files.Append( | 286 input_files.Append( |
287 'transport_dib_linux.cc' | 287 'transport_dib_linux.cc', |
| 288 'x11_util.cc' |
288 ) | 289 ) |
289 | 290 |
290 if env.Bit('mac'): | 291 if env.Bit('mac'): |
291 input_files.Append( | 292 input_files.Append( |
292 'transport_dib_mac.cc' | 293 'transport_dib_mac.cc' |
293 ) | 294 ) |
294 | 295 |
295 if not env.Bit('mac'): | 296 if not env.Bit('mac'): |
296 # TODO(port): This should be enabled for all platforms. | 297 # TODO(port): This should be enabled for all platforms. |
297 env.ChromeLibrary('common', input_files) | 298 env.ChromeLibrary('common', input_files) |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 './common.vsprops', | 342 './common.vsprops', |
342 '$(SolutionDir)../build/release.vsprops', | 343 '$(SolutionDir)../build/release.vsprops', |
343 ]) | 344 ]) |
344 | 345 |
345 p.AddFileConfig('../tools/build/win/precompiled.cc', | 346 p.AddFileConfig('../tools/build/win/precompiled.cc', |
346 'Debug|Win32', | 347 'Debug|Win32', |
347 tools=[ | 348 tools=[ |
348 MSVSTool('VCCLCompilerTool', | 349 MSVSTool('VCCLCompilerTool', |
349 UsePrecompiledHeader='1'), | 350 UsePrecompiledHeader='1'), |
350 ]) | 351 ]) |
OLD | NEW |