| 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 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 environment_list.append(mac_test_optimized_env) | 655 environment_list.append(mac_test_optimized_env) |
| 656 | 656 |
| 657 # Linux ------------------------------------------------------------------ | 657 # Linux ------------------------------------------------------------------ |
| 658 | 658 |
| 659 linux_env = binaries_env.Clone( | 659 linux_env = binaries_env.Clone( |
| 660 tools = ['target_platform_linux'], | 660 tools = ['target_platform_linux'], |
| 661 FIREFOX_PLUGIN_DIR = '/home/$USER/.mozilla/plugins', | 661 FIREFOX_PLUGIN_DIR = '/home/$USER/.mozilla/plugins', |
| 662 CG_DIR = '$CG_BASE_DIR/linux', | 662 CG_DIR = '$CG_BASE_DIR/linux', |
| 663 ) | 663 ) |
| 664 linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX']) | 664 linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX']) |
| 665 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') | 665 if base_env.Bit('host_linux'): |
| 666 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') |
| 666 | 667 |
| 667 linux_env.Append( | 668 linux_env.Append( |
| 668 RENDERER_INCLUDE_PATH = [ | 669 RENDERER_INCLUDE_PATH = [ |
| 669 '$GLEW_DIR/include', | 670 '$GLEW_DIR/include', |
| 670 '$CG_DIR/include', | 671 '$CG_DIR/include', |
| 671 ], | 672 ], |
| 672 RENDERER_LIB_PATH = [ | 673 RENDERER_LIB_PATH = [ |
| 673 '$CG_DIR/lib', | 674 '$CG_DIR/lib', |
| 674 '$GLEW_DIR/lib', | 675 '$GLEW_DIR/lib', |
| 675 ], | 676 ], |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 'o3d', environment_list, | 832 'o3d', environment_list, |
| 832 exclude_pattern = '.*third_party.*', | 833 exclude_pattern = '.*third_party.*', |
| 833 extra_build_targets = { | 834 extra_build_targets = { |
| 834 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', | 835 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', |
| 835 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', | 836 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', |
| 836 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', | 837 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', |
| 837 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', | 838 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', |
| 838 }, | 839 }, |
| 839 ) | 840 ) |
| 840 solution_env.Alias('solution', solution) | 841 solution_env.Alias('solution', solution) |
| OLD | NEW |