| OLD | NEW |
| 1 # Copyright 2009, Google Inc. | 1 # Copyright 2009, 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 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 CPPDEFINES = [ | 682 CPPDEFINES = [ |
| 683 'RENDERER_GL', | 683 'RENDERER_GL', |
| 684 'LINUX', | 684 'LINUX', |
| 685 ['NACL_LINUX', '1'], | 685 ['NACL_LINUX', '1'], |
| 686 'SK_BUILD_FOR_UNIX' | 686 'SK_BUILD_FOR_UNIX' |
| 687 ], | 687 ], |
| 688 CCFLAGS = ['-Wstrict-aliasing', '-m32'], | 688 CCFLAGS = ['-Wstrict-aliasing', '-m32'], |
| 689 LINKFLAGS = ['-m32'], | 689 LINKFLAGS = ['-m32'], |
| 690 LIBS = ['pthread', 'rt'], | 690 LIBS = ['pthread', 'rt'], |
| 691 NACL_HTP_LIBS = ['ssl', 'crypto'], | 691 NACL_HTP_LIBS = ['ssl', 'crypto'], |
| 692 BUILD_COMPONENTS = [ |
| 693 'installer/linux' |
| 694 ], |
| 692 ) | 695 ) |
| 693 | 696 |
| 694 linux_cg_dir = ARGUMENTS.get('linux-cg-dir', 'hermetic') | 697 linux_cg_dir = ARGUMENTS.get('linux-cg-dir', 'hermetic') |
| 695 if linux_cg_dir != 'hermetic': | 698 if linux_cg_dir != 'hermetic': |
| 696 linux_cg_dir = linux_cg_dir or '/usr' | 699 linux_cg_dir = linux_cg_dir or '/usr' |
| 697 linux_env['CG_DIR'] = linux_cg_dir | 700 linux_env['CG_DIR'] = linux_cg_dir |
| 698 linux_glew_dir = ARGUMENTS.get('linux-glew-dir', 'hermetic') | 701 linux_glew_dir = ARGUMENTS.get('linux-glew-dir', 'hermetic') |
| 699 if linux_glew_dir != 'hermetic': | 702 if linux_glew_dir != 'hermetic': |
| 700 linux_glew_dir = linux_glew_dir or '/usr' | 703 linux_glew_dir = linux_glew_dir or '/usr' |
| 701 linux_env['GLEW_DIR'] = linux_glew_dir | 704 linux_env['GLEW_DIR'] = linux_glew_dir |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 'o3d', environment_list, | 834 'o3d', environment_list, |
| 832 exclude_pattern = '.*third_party.*', | 835 exclude_pattern = '.*third_party.*', |
| 833 extra_build_targets = { | 836 extra_build_targets = { |
| 834 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', | 837 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', |
| 835 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', | 838 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', |
| 836 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', | 839 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', |
| 837 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', | 840 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', |
| 838 }, | 841 }, |
| 839 ) | 842 ) |
| 840 solution_env.Alias('solution', solution) | 843 solution_env.Alias('solution', solution) |
| OLD | NEW |