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

Side by Side Diff: webkit/tools/test_shell/test_shell.gyp

Issue 231020: Preliminary fixes to enable link dependent objects.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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
« no previous file with comments | « webkit/extensions/v8/gears_extension.cc ('k') | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'test_shell_windows_resource_files': [ 8 'test_shell_windows_resource_files': [
9 'resources/test_shell.rc', 9 'resources/test_shell.rc',
10 'resources/pan_east.cur', 10 'resources/pan_east.cur',
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 'sources!': [ 478 'sources!': [
479 '../npapi_layout_test_plugin/npapi_layout_test_plugin.def', 479 '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
480 '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc', 480 '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
481 ], 481 ],
482 # TODO(bradnelson): 482 # TODO(bradnelson):
483 # This copy should really live here, as a post-build step, 483 # This copy should really live here, as a post-build step,
484 # but it's currently being implemented via 484 # but it's currently being implemented via
485 # AdditionalDependencies, which tries to do the copy before 485 # AdditionalDependencies, which tries to do the copy before
486 # the file is built... 486 # the file is built...
487 # 487 #
488 #}, { # OS == "win" 488 }, { # OS == "win"
489 # # The old VS build would explicitly copy the .dll into the 489 # # The old VS build would explicitly copy the .dll into the
490 # # plugins subdirectory like this. It might be possible to 490 # # plugins subdirectory like this. It might be possible to
491 # # use the 'product_dir' setting to build directly into 491 # # use the 'product_dir' setting to build directly into
492 # # plugins/ (as is done on Linux), but we'd need to verify 492 # # plugins/ (as is done on Linux), but we'd need to verify
493 # # that nothing breaks first. 493 # # that nothing breaks first.
494 # 'copies': [ 494 # 'copies': [
495 # { 495 # {
496 # 'destination': '<(PRODUCT_DIR)/plugins', 496 # 'destination': '<(PRODUCT_DIR)/plugins',
497 # 'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'], 497 # 'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
498 # }, 498 # },
499 # ], 499 # ],
500 'link_settings': {
501 'libraries': [
502 "winmm.lib",
503 ],
504 },
500 }], 505 }],
501 ['OS=="mac"', { 506 ['OS=="mac"', {
502 'product_name': 'TestNetscapePlugIn', 507 'product_name': 'TestNetscapePlugIn',
503 'product_extension': 'plugin', 508 'product_extension': 'plugin',
504 'link_settings': { 509 'link_settings': {
505 'libraries': [ 510 'libraries': [
506 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 511 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
507 ], 512 ],
508 }, 513 },
509 }], 514 }],
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 'link_settings': { 662 'link_settings': {
658 'libraries': [ 663 'libraries': [
659 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 664 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
660 ], 665 ],
661 }, 666 },
662 }, 667 },
663 ], 668 ],
664 }], 669 }],
665 ], 670 ],
666 } 671 }
OLDNEW
« no previous file with comments | « webkit/extensions/v8/gears_extension.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698