Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: third_party/mesa/mesa.gyp

Issue 860623002: Revert of Revert of linux/gyp: Find missing symbols at build time, not runtime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/media_cdm.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'generated_src_dir': 'src/chromium_gensrc', 7 'generated_src_dir': 'src/chromium_gensrc',
8 }, 8 },
9 'target_defaults': { 9 'target_defaults': {
10 'defines': [ 10 'defines': [
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 ], 675 ],
676 }, 676 },
677 'conditions': [ 677 'conditions': [
678 ['OS=="win"', { 678 ['OS=="win"', {
679 'defines': [ 679 'defines': [
680 'BUILD_GL32', 680 'BUILD_GL32',
681 'KEYWORD1=GLAPI', 681 'KEYWORD1=GLAPI',
682 'KEYWORD2=GLAPIENTRY', 682 'KEYWORD2=GLAPIENTRY',
683 ], 683 ],
684 }], 684 }],
685 ['OS=="linux"', {
686 'link_settings': {
687 'libraries': [
688 '-ldl',
689 '-lm',
690 '-lstdc++',
691 ],
692 },
693 }],
685 ], 694 ],
686 'include_dirs': [ 695 'include_dirs': [
687 'src/src/mapi', 696 'src/src/mapi',
688 'src/src/mesa', 697 'src/src/mesa',
689 'src/src/mesa/drivers', 698 'src/src/mesa/drivers',
690 '<(generated_src_dir)/mesa', 699 '<(generated_src_dir)/mesa',
691 ], 700 ],
692 'msvs_disabled_warnings': [ 701 'msvs_disabled_warnings': [
693 4005, 4018, 4065, 4090, 4099, 4291, 4345, 4267, 702 4005, 4018, 4065, 4090, 4099, 4291, 4345, 4267,
694 ], 703 ],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 '<(PRODUCT_DIR)/libosmesa.so', 740 '<(PRODUCT_DIR)/libosmesa.so',
732 '<(SHARED_LIB_DIR)/libosmesa.so', 741 '<(SHARED_LIB_DIR)/libosmesa.so',
733 ], 742 ],
734 }, 743 },
735 ], 744 ],
736 }, 745 },
737 ], 746 ],
738 }], 747 }],
739 ], 748 ],
740 } 749 }
OLDNEW
« no previous file with comments | « media/media_cdm.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698