| 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 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 'GLEW', | 677 'GLEW', |
| 678 'Cg', | 678 'Cg', |
| 679 'CgGL', | 679 'CgGL', |
| 680 ], | 680 ], |
| 681 CPPDEFINES = [ | 681 CPPDEFINES = [ |
| 682 'RENDERER_GL', | 682 'RENDERER_GL', |
| 683 'LINUX', | 683 'LINUX', |
| 684 ['NACL_LINUX', '1'], | 684 ['NACL_LINUX', '1'], |
| 685 'SK_BUILD_FOR_UNIX' | 685 'SK_BUILD_FOR_UNIX' |
| 686 ], | 686 ], |
| 687 CCFLAGS = ['-Wstrict-aliasing', '-m32'], | 687 CCFLAGS = ['-Wstrict-aliasing', '-fvisibility=hidden', '-m32'], |
| 688 LINKFLAGS = ['-m32'], | 688 LINKFLAGS = ['-m32'], |
| 689 LIBS = ['pthread', 'rt', 'dl'], | 689 LIBS = ['pthread', 'rt', 'dl'], |
| 690 NACL_HTP_LIBS = ['ssl', 'crypto'], | 690 NACL_HTP_LIBS = ['ssl', 'crypto'], |
| 691 BUILD_COMPONENTS = [ | 691 BUILD_COMPONENTS = [ |
| 692 'installer/linux' | 692 'installer/linux' |
| 693 ], | 693 ], |
| 694 ) | 694 ) |
| 695 | 695 |
| 696 linux_cg_dir = ARGUMENTS.get('linux-cg-dir', 'hermetic') | 696 linux_cg_dir = ARGUMENTS.get('linux-cg-dir', 'hermetic') |
| 697 if linux_cg_dir != 'hermetic': | 697 if linux_cg_dir != 'hermetic': |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 833 'o3d', environment_list, | 833 'o3d', environment_list, |
| 834 exclude_pattern = '.*third_party.*', | 834 exclude_pattern = '.*third_party.*', |
| 835 extra_build_targets = { | 835 extra_build_targets = { |
| 836 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', | 836 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', |
| 837 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', | 837 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', |
| 838 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', | 838 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', |
| 839 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', | 839 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', |
| 840 }, | 840 }, |
| 841 ) | 841 ) |
| 842 solution_env.Alias('solution', solution) | 842 solution_env.Alias('solution', solution) |
| OLD | NEW |