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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 7019041: Fix up PathProvider on the Mac for FILE_MODULE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved os mesa libraries on mac to better location Created 9 years, 7 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_exe_target': 0, 8 'chrome_exe_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 'msvs_settings': { 468 'msvs_settings': {
469 'VCLinkerTool': { 469 'VCLinkerTool': {
470 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 470 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
471 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', 471 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
472 }, 472 },
473 }, 473 },
474 }], 474 }],
475 ], 475 ],
476 }, 476 },
477 { 477 {
478 'target_name': 'chrome_mesa', 478 'target_name': 'chrome_mesa',
Mark Mentovai 2011/05/23 20:59:17 Should mesa be part of the normal build or is this
479 'type': 'none', 479 'type': 'none',
480 'dependencies': [ 480 'dependencies': [
481 'chrome', 481 'chrome',
482 '../third_party/mesa/mesa.gyp:osmesa', 482 '../third_party/mesa/mesa.gyp:osmesa',
483 ], 483 ],
484 'conditions': [ 484 'conditions': [
485 ['OS=="mac"', { 485 ['OS=="mac"', {
486 'copies': [{ 486 'copies': [{
487 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Vers ions/<(version_full)/<(mac_product_name) Helper.app/Contents/MacOS/', 487 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Vers ions/<(version_full)/<(mac_product_name) Framework.framework/Libraries/',
488 'files': ['<(PRODUCT_DIR)/osmesa.so'], 488 'files': ['<(PRODUCT_DIR)/osmesa.so'],
489 }], 489 }],
490 }], 490 }],
491 ], 491 ],
492 }, 492 },
493 ], 493 ],
494 'conditions': [ 494 'conditions': [
495 ['OS=="win"', { 495 ['OS=="win"', {
496 'targets': [ 496 'targets': [
497 { 497 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 'configurations': { 530 'configurations': {
531 'Common_Base': { 531 'Common_Base': {
532 'msvs_target_platform': 'x64', 532 'msvs_target_platform': 'x64',
533 }, 533 },
534 }, 534 },
535 }, 535 },
536 ], 536 ],
537 }], 537 }],
538 ], 538 ],
539 } 539 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698