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

Side by Side Diff: chrome/chrome_common.gypi

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: updated to trunk and added spaces, collapsed one check 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_common_target': 0, 8 'chrome_common_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 'common/web_apps.cc', 247 'common/web_apps.cc',
248 'common/web_apps.h', 248 'common/web_apps.h',
249 'common/web_resource/web_resource_unpacker.cc', 249 'common/web_resource/web_resource_unpacker.cc',
250 'common/web_resource/web_resource_unpacker.h', 250 'common/web_resource/web_resource_unpacker.h',
251 'common/worker_thread_ticker.cc', 251 'common/worker_thread_ticker.cc',
252 'common/worker_thread_ticker.h', 252 'common/worker_thread_ticker.h',
253 'common/zip.cc', # Requires zlib directly. 253 'common/zip.cc', # Requires zlib directly.
254 'common/zip.h', 254 'common/zip.h',
255 ], 255 ],
256 'conditions': [ 256 'conditions': [
257 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 257 ['toolkit_uses_gtk == 1', {
258 'dependencies': [ 258 'dependencies': [
259 '../build/linux/system.gyp:gtk', 259 '../build/linux/system.gyp:gtk',
260 ], 260 ],
261 'export_dependent_settings': [ 261 'export_dependent_settings': [
262 '../third_party/sqlite/sqlite.gyp:sqlite', 262 '../third_party/sqlite/sqlite.gyp:sqlite',
263 ], 263 ],
264 'link_settings': { 264 'link_settings': {
265 'libraries': [ 265 'libraries': [
266 '-lX11', 266 '-lX11',
267 '-lXrender', 267 '-lXrender',
268 '-lXss', 268 '-lXss',
269 '-lXext', 269 '-lXext',
270 ], 270 ],
271 }, 271 },
272 },], 272 },],
273 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris "', { 273 ['os_posix == 1 and OS != "mac"', {
274 'include_dirs': [ 274 'include_dirs': [
275 '<(SHARED_INTERMEDIATE_DIR)', 275 '<(SHARED_INTERMEDIATE_DIR)',
276 ], 276 ],
277 # Because posix_version generates a header, we must set the 277 # Because posix_version generates a header, we must set the
278 # hard_dependency flag. 278 # hard_dependency flag.
279 'hard_dependency': 1, 279 'hard_dependency': 1,
280 'actions': [ 280 'actions': [
281 { 281 {
282 'action_name': 'posix_version', 282 'action_name': 'posix_version',
283 'variables': { 283 'variables': {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 'chrome_strings', 378 'chrome_strings',
379 '../app/app.gyp:app_base', 379 '../app/app.gyp:app_base',
380 '../base/base.gyp:base', 380 '../base/base.gyp:base',
381 '../gpu/gpu.gyp:gpu_ipc', 381 '../gpu/gpu.gyp:gpu_ipc',
382 '../net/net.gyp:net_resources', 382 '../net/net.gyp:net_resources',
383 '../net/net.gyp:net', 383 '../net/net.gyp:net',
384 '../third_party/icu/icu.gyp:icui18n', 384 '../third_party/icu/icu.gyp:icui18n',
385 '../third_party/icu/icu.gyp:icuuc', 385 '../third_party/icu/icu.gyp:icuuc',
386 ], 386 ],
387 'conditions': [ 387 'conditions': [
388 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 388 ['os_posix == 1 and OS != "mac"', {
389 'conditions': [ 389 'conditions': [
390 ['use_openssl==1', { 390 ['use_openssl==1', {
391 'dependencies': [ 391 'dependencies': [
392 '../third_party/openssl/openssl.gyp:openssl', 392 '../third_party/openssl/openssl.gyp:openssl',
393 ], 393 ],
394 }, 394 },
395 { # else !use_openssl 395 { # else !use_openssl
396 'dependencies': [ 396 'dependencies': [
397 '../build/linux/system.gyp:nss', 397 '../build/linux/system.gyp:nss',
398 ], 398 ],
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 'configurations': { 532 'configurations': {
533 'Common_Base': { 533 'Common_Base': {
534 'msvs_target_platform': 'x64', 534 'msvs_target_platform': 'x64',
535 }, 535 },
536 }, 536 },
537 }, 537 },
538 ], 538 ],
539 }], 539 }],
540 ], 540 ],
541 } 541 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_exe.gypi » ('j') | chrome/chrome_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698