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

Side by Side Diff: chrome/chrome.gyp

Issue 84005: fix linking on linux by explicitly adding gthread (Closed)
Patch Set: Created 11 years, 8 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 | « build/linux/system.gyp ('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 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 ], 1615 ],
1616 'xcode_settings': { 1616 'xcode_settings': {
1617 'INFOPLIST_FILE': 'app/app-Info.plist', 1617 'INFOPLIST_FILE': 'app/app-Info.plist',
1618 }, 1618 },
1619 'conditions': [ 1619 'conditions': [
1620 ['OS=="linux"', { 1620 ['OS=="linux"', {
1621 'dependencies': [ 1621 'dependencies': [
1622 'views', 1622 'views',
1623 # Needed for chrome_dll_main.cc #include of gtk/gtk.h 1623 # Needed for chrome_dll_main.cc #include of gtk/gtk.h
1624 '../build/linux/system.gyp:gtk', 1624 '../build/linux/system.gyp:gtk',
1625 # Needed for chrome_dll_main.cc use of g_thread_init
1626 '../build/linux/system.gyp:gthread',
1625 ], 1627 ],
1626 'copies': [ 1628 'copies': [
1627 { 1629 {
1628 'destination': '<(PRODUCT_DIR)', 1630 'destination': '<(PRODUCT_DIR)',
1629 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak'], 1631 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak'],
1630 }, 1632 },
1631 { 1633 {
1632 'destination': '<(PRODUCT_DIR)/locales', 1634 'destination': '<(PRODUCT_DIR)/locales',
1633 'files': ['<(INTERMEDIATE_DIR)/repack/en-US.pak'], 1635 'files': ['<(INTERMEDIATE_DIR)/repack/en-US.pak'],
1634 }, 1636 },
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
2918 '../tools/code_coverage/coverage_posix.py', 2920 '../tools/code_coverage/coverage_posix.py',
2919 '--directory', 2921 '--directory',
2920 '<(PRODUCT_DIR)' ], 2922 '<(PRODUCT_DIR)' ],
2921 }, 2923 },
2922 ], # 'actions' 2924 ], # 'actions'
2923 }, 2925 },
2924 ] 2926 ]
2925 }], 2927 }],
2926 ], # 'conditions' 2928 ], # 'conditions'
2927 } 2929 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698