| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', | 520 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', |
| 521 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', | 521 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', |
| 522 ], | 522 ], |
| 523 }, | 523 }, |
| 524 }], | 524 }], |
| 525 ['use_x11==1', { | 525 ['use_x11==1', { |
| 526 'all_dependent_settings': { | 526 'all_dependent_settings': { |
| 527 'ldflags': [ | 527 'ldflags': [ |
| 528 '-L<(PRODUCT_DIR)', | 528 '-L<(PRODUCT_DIR)', |
| 529 ], | 529 ], |
| 530 # TODO(jamesr): Targets using X11 should declare dependencies on the | |
| 531 # appropriate build/linux/system.gyp targets themselves instead of | |
| 532 # independently picking it up from ui. | |
| 533 'link_settings': { | |
| 534 'libraries': [ | |
| 535 '-lX11', | |
| 536 '-lXcursor', | |
| 537 '-lXrender', | |
| 538 ], | |
| 539 }, | |
| 540 }, | 530 }, |
| 541 'dependencies': [ | 531 'dependencies': [ |
| 542 '../build/linux/system.gyp:x11', | 532 '../build/linux/system.gyp:x11', |
| 543 '../build/linux/system.gyp:xcursor', | 533 '../build/linux/system.gyp:xcursor', |
| 544 '../build/linux/system.gyp:xext', | 534 '../build/linux/system.gyp:xext', |
| 545 '../build/linux/system.gyp:xfixes', | 535 '../build/linux/system.gyp:xfixes', |
| 546 '../build/linux/system.gyp:xrender', # For XRender* function calls
in x11_util.cc. | 536 '../build/linux/system.gyp:xrender', # For XRender* function calls
in x11_util.cc. |
| 547 ], | 537 ], |
| 548 }], | 538 }], |
| 549 ['use_ozone==0', { | 539 ['use_ozone==0', { |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 642 'variables': { | 632 'variables': { |
| 643 'jni_gen_package': 'ui', | 633 'jni_gen_package': 'ui', |
| 644 'jni_generator_ptr_type': 'long', | 634 'jni_generator_ptr_type': 'long', |
| 645 }, | 635 }, |
| 646 'includes': [ '../build/jni_generator.gypi' ], | 636 'includes': [ '../build/jni_generator.gypi' ], |
| 647 }, | 637 }, |
| 648 ], | 638 ], |
| 649 }], | 639 }], |
| 650 ], | 640 ], |
| 651 } | 641 } |
| OLD | NEW |