| OLD | NEW |
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_system', | 4 'target_name': 'mojo_system', |
| 5 'type': 'shared_library', | 5 'type': 'shared_library', |
| 6 'defines': [ | 6 'defines': [ |
| 7 'MOJO_SYSTEM_IMPLEMENTATION', | 7 'MOJO_SYSTEM_IMPLEMENTATION', |
| 8 ], | 8 ], |
| 9 'include_dirs': [ | 9 'include_dirs': [ |
| 10 '..', | 10 '..', |
| 11 ], | 11 ], |
| 12 'direct_dependent_settings': { | 12 'direct_dependent_settings': { |
| 13 'include_dirs': [ | 13 'include_dirs': [ |
| 14 '..', | 14 '..', |
| 15 ], | 15 ], |
| 16 }, | 16 }, |
| 17 'sources': [ | 17 'sources': [ |
| 18 'public/c/system/async_waiter.h', | 18 'public/c/system/async_waiter.h', |
| 19 'public/c/system/core.h', | 19 'public/c/system/core.h', |
| 20 'public/c/system/macros.h', | 20 'public/c/system/macros.h', |
| 21 'public/c/system/system_export.h', | 21 'public/c/system/system_export.h', |
| 22 'public/cpp/system/core.h', | 22 'public/cpp/system/core.h', |
| 23 'public/system/core_private.cc', | 23 'public/system/core_private.cc', |
| 24 'public/system/core_private.h', | 24 'public/system/core_private.h', |
| 25 ], | 25 ], |
| 26 'conditions': [ | 26 'conditions': [ |
| 27 ['OS=="mac"', { | 27 ['OS=="mac"', { |
| 28 'xcode_settings': { | 28 'xcode_settings': { |
| 29 # Make it a run-path dependent library. | 29 # Make it a loader-path dependent library. |
| 30 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 30 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
| 31 }, | 31 }, |
| 32 'direct_dependent_settings': { | 32 'conditions': [ |
| 33 'xcode_settings': { | 33 ['mac_breakpad==1', { |
| 34 # Look for run-path dependent libraries in the loader's directory. | 34 'variables': { |
| 35 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], | 35 # A real .dSYM is needed for dump_syms to operate on. |
| 36 }, | 36 'mac_real_dsym': 1, |
| 37 }, | 37 }, |
| 38 }], |
| 39 ], |
| 38 }], | 40 }], |
| 39 ], | 41 ], |
| 40 }, | 42 }, |
| 41 { | 43 { |
| 42 'target_name': 'mojo_gles2', | 44 'target_name': 'mojo_gles2', |
| 43 'type': 'shared_library', | 45 'type': 'shared_library', |
| 44 'defines': [ | 46 'defines': [ |
| 45 'MOJO_GLES2_IMPLEMENTATION', | 47 'MOJO_GLES2_IMPLEMENTATION', |
| 46 'GLES2_USE_MOJO', | 48 'GLES2_USE_MOJO', |
| 47 ], | 49 ], |
| (...skipping 13 matching lines...) Expand all Loading... |
| 61 }, | 63 }, |
| 62 'sources': [ | 64 'sources': [ |
| 63 'public/gles2/gles2.h', | 65 'public/gles2/gles2.h', |
| 64 'public/gles2/gles2_export.h', | 66 'public/gles2/gles2_export.h', |
| 65 'public/gles2/gles2_private.cc', | 67 'public/gles2/gles2_private.cc', |
| 66 'public/gles2/gles2_private.h', | 68 'public/gles2/gles2_private.h', |
| 67 ], | 69 ], |
| 68 'conditions': [ | 70 'conditions': [ |
| 69 ['OS=="mac"', { | 71 ['OS=="mac"', { |
| 70 'xcode_settings': { | 72 'xcode_settings': { |
| 71 # Make it a run-path dependent library. | 73 # Make it a loader-path dependent library. |
| 72 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 74 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
| 73 }, | |
| 74 'direct_dependent_settings': { | |
| 75 'xcode_settings': { | |
| 76 # Look for run-path dependent libraries in the loader's directory. | |
| 77 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], | |
| 78 }, | |
| 79 }, | 75 }, |
| 80 }], | 76 }], |
| 81 ], | 77 ], |
| 82 }, | 78 }, |
| 83 { | 79 { |
| 84 'target_name': 'mojo_test_support', | 80 'target_name': 'mojo_test_support', |
| 85 'type': 'shared_library', | 81 'type': 'shared_library', |
| 86 'defines': [ | 82 'defines': [ |
| 87 'MOJO_TEST_SUPPORT_IMPLEMENTATION', | 83 'MOJO_TEST_SUPPORT_IMPLEMENTATION', |
| 88 ], | 84 ], |
| 89 'include_dirs': [ | 85 'include_dirs': [ |
| 90 '..', | 86 '..', |
| 91 ], | 87 ], |
| 92 'direct_dependent_settings': { | 88 'direct_dependent_settings': { |
| 93 'include_dirs': [ | 89 'include_dirs': [ |
| 94 '..', | 90 '..', |
| 95 ], | 91 ], |
| 96 }, | 92 }, |
| 97 'sources': [ | 93 'sources': [ |
| 98 'public/tests/test_support.h', | 94 'public/tests/test_support.h', |
| 99 'public/tests/test_support_private.cc', | 95 'public/tests/test_support_private.cc', |
| 100 'public/tests/test_support_private.h', | 96 'public/tests/test_support_private.h', |
| 101 'public/tests/test_support_export.h', | 97 'public/tests/test_support_export.h', |
| 102 ], | 98 ], |
| 103 'conditions': [ | 99 'conditions': [ |
| 104 ['OS=="mac"', { | 100 ['OS=="mac"', { |
| 105 'xcode_settings': { | 101 'xcode_settings': { |
| 106 # Make it a run-path dependent library. | 102 # Make it a loader-path dependent library. |
| 107 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 103 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
| 108 }, | |
| 109 'direct_dependent_settings': { | |
| 110 'xcode_settings': { | |
| 111 # Look for run-path dependent libraries in the loader's directory. | |
| 112 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], | |
| 113 }, | |
| 114 }, | 104 }, |
| 115 }], | 105 }], |
| 116 ], | 106 ], |
| 117 }, | 107 }, |
| 118 { | 108 { |
| 119 'target_name': 'mojo_public_test_utils', | 109 'target_name': 'mojo_public_test_utils', |
| 120 'type': 'static_library', | 110 'type': 'static_library', |
| 121 'dependencies': [ | 111 'dependencies': [ |
| 122 '../base/base.gyp:base', | 112 '../base/base.gyp:base', |
| 123 '../testing/gtest.gyp:gtest', | 113 '../testing/gtest.gyp:gtest', |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 ], | 373 ], |
| 384 'dependencies': [ | 374 'dependencies': [ |
| 385 'mojo_shell_bindings', | 375 'mojo_shell_bindings', |
| 386 ], | 376 ], |
| 387 'export_dependent_settings': [ | 377 'export_dependent_settings': [ |
| 388 'mojo_shell_bindings', | 378 'mojo_shell_bindings', |
| 389 ], | 379 ], |
| 390 }, | 380 }, |
| 391 ], | 381 ], |
| 392 } | 382 } |
| OLD | NEW |