| OLD | NEW |
| 1 # Copyright 2008, Google Inc. | 1 # Copyright 2008, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 'skia', | 331 'skia', |
| 332 'testing', | 332 'testing', |
| 333 'third_party', | 333 'third_party', |
| 334 'webkit', | 334 'webkit', |
| 335 ] | 335 ] |
| 336 | 336 |
| 337 # TODO: fix code that triggers these warnings. | 337 # TODO: fix code that triggers these warnings. |
| 338 excluded_warnings = [ | 338 excluded_warnings = [ |
| 339 '-Wno-unknown-pragmas', # TODO: remove all the Windows-specific #pragmas. | 339 '-Wno-unknown-pragmas', # TODO: remove all the Windows-specific #pragmas. |
| 340 '-Wno-unused-function', # TODO: there's just one Skia function. | 340 '-Wno-unused-function', # TODO: there's just one Skia function. |
| 341 '-Wno-unused-variable', # TODO: there's just one v8 function. |
| 341 '-Wno-switch', # TODO: this is likely masking real bugs. | 342 '-Wno-switch', # TODO: this is likely masking real bugs. |
| 342 '-Wno-sign-compare', # TODO: this is likely masking real bugs. | 343 '-Wno-sign-compare', # TODO: this is likely masking real bugs. |
| 343 '-Wno-missing-braces', # TODO: just a file in net. | 344 '-Wno-missing-braces', # TODO: just a file in net. |
| 344 | 345 |
| 345 # Not TODO: This is technically nonstandard, but a lot of the image | 346 # Not TODO: This is technically nonstandard, but a lot of the image |
| 346 # decoding code depends on it and osx wants this. | 347 # decoding code depends on it and osx wants this. |
| 347 '-Wno-multichar', | 348 '-Wno-multichar', |
| 349 |
| 350 '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 |
| 351 '-Wno-reorder', # TODO: many tedious small fixes. |
| 348 ] | 352 ] |
| 349 env.Replace( | 353 env.Replace( |
| 350 CCFLAGS = ['-m32', '-g', '-pthread', '-Wall', '-Werror'] + excluded_warnin
gs, | 354 CCFLAGS = ['-m32', '-g', '-pthread'], |
| 351 # Needed for using ext/hash_map on GCC 4.3 | 355 CXXFLAGS = ['-Wall', '-Werror'] + excluded_warnings, |
| 352 CXXFLAGS = ['-Wno-deprecated'], | |
| 353 LINKFLAGS = ['-m32', '-pthread'], | 356 LINKFLAGS = ['-m32', '-pthread'], |
| 354 # We need rt for clock_gettime. | 357 # We need rt for clock_gettime. |
| 355 LIBS = ['rt'], | 358 LIBS = ['rt'], |
| 356 | 359 |
| 357 PERL = '/usr/bin/perl', | 360 PERL = '/usr/bin/perl', |
| 358 PERL_INCLUDE_FLAG = '-I ', | 361 PERL_INCLUDE_FLAG = '-I ', |
| 359 PERL_INCLUDE_SUFFIX = '', | 362 PERL_INCLUDE_SUFFIX = '', |
| 360 _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, ' | 363 _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, ' |
| 361 'PERL_INCLUDE_PATH, ' | 364 'PERL_INCLUDE_PATH, ' |
| 362 'PERL_INCLUDE_SUFFIX,' | 365 'PERL_INCLUDE_SUFFIX,' |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 initial_indent = ' '*32, | 505 initial_indent = ' '*32, |
| 503 subsequent_indent = ' '*32, | 506 subsequent_indent = ' '*32, |
| 504 ) | 507 ) |
| 505 components = tw.fill(', '.join(components)) | 508 components = tw.fill(', '.join(components)) |
| 506 | 509 |
| 507 Help(help_fmt % components) | 510 Help(help_fmt % components) |
| 508 | 511 |
| 509 | 512 |
| 510 Import('build_component') | 513 Import('build_component') |
| 511 Default(build_component) | 514 Default(build_component) |
| OLD | NEW |