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

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 fixed some nits 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 'common/web_apps.cc', 249 'common/web_apps.cc',
250 'common/web_apps.h', 250 'common/web_apps.h',
251 'common/web_resource/web_resource_unpacker.cc', 251 'common/web_resource/web_resource_unpacker.cc',
252 'common/web_resource/web_resource_unpacker.h', 252 'common/web_resource/web_resource_unpacker.h',
253 'common/worker_thread_ticker.cc', 253 'common/worker_thread_ticker.cc',
254 'common/worker_thread_ticker.h', 254 'common/worker_thread_ticker.h',
255 'common/zip.cc', # Requires zlib directly. 255 'common/zip.cc', # Requires zlib directly.
256 'common/zip.h', 256 'common/zip.h',
257 ], 257 ],
258 'conditions': [ 258 'conditions': [
259 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 259 ['toolkit_uses_gtk==1', {
Evan Stade 2011/05/17 00:46:12 wow, we are really inconsistent about putting spac
260 'dependencies': [ 260 'dependencies': [
261 '../build/linux/system.gyp:gtk', 261 '../build/linux/system.gyp:gtk',
262 ], 262 ],
263 'export_dependent_settings': [ 263 'export_dependent_settings': [
264 '../third_party/sqlite/sqlite.gyp:sqlite', 264 '../third_party/sqlite/sqlite.gyp:sqlite',
265 ], 265 ],
266 'link_settings': { 266 'link_settings': {
267 'libraries': [ 267 'libraries': [
268 '-lX11', 268 '-lX11',
269 '-lXrender', 269 '-lXrender',
270 '-lXss', 270 '-lXss',
271 '-lXext', 271 '-lXext',
272 ], 272 ],
273 }, 273 },
274 },], 274 },],
275 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris "', { 275 [ 'os_posix==1 and OS!="mac"', {
276 'include_dirs': [ 276 'include_dirs': [
277 '<(SHARED_INTERMEDIATE_DIR)', 277 '<(SHARED_INTERMEDIATE_DIR)',
278 ], 278 ],
279 # Because posix_version generates a header, we must set the 279 # Because posix_version generates a header, we must set the
280 # hard_dependency flag. 280 # hard_dependency flag.
281 'hard_dependency': 1, 281 'hard_dependency': 1,
282 'actions': [ 282 'actions': [
283 { 283 {
284 'action_name': 'posix_version', 284 'action_name': 'posix_version',
285 'variables': { 285 'variables': {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 'chrome_strings', 380 'chrome_strings',
381 '../app/app.gyp:app_base', 381 '../app/app.gyp:app_base',
382 '../base/base.gyp:base', 382 '../base/base.gyp:base',
383 '../gpu/gpu.gyp:gpu_ipc', 383 '../gpu/gpu.gyp:gpu_ipc',
384 '../net/net.gyp:net_resources', 384 '../net/net.gyp:net_resources',
385 '../net/net.gyp:net', 385 '../net/net.gyp:net',
386 '../third_party/icu/icu.gyp:icui18n', 386 '../third_party/icu/icu.gyp:icui18n',
387 '../third_party/icu/icu.gyp:icuuc', 387 '../third_party/icu/icu.gyp:icuuc',
388 ], 388 ],
389 'conditions': [ 389 'conditions': [
390 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 390 [ 'os_posix==1 and OS!="mac"', {
Evan Stade 2011/05/17 00:46:12 I guess to be consistent there should be no space
391 'conditions': [ 391 'conditions': [
392 ['use_openssl==1', { 392 ['use_openssl==1', {
393 'dependencies': [ 393 'dependencies': [
394 '../third_party/openssl/openssl.gyp:openssl', 394 '../third_party/openssl/openssl.gyp:openssl',
395 ], 395 ],
396 }, 396 },
397 { # else !use_openssl 397 { # else !use_openssl
398 'dependencies': [ 398 'dependencies': [
399 '../build/linux/system.gyp:nss', 399 '../build/linux/system.gyp:nss',
400 ], 400 ],
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 'configurations': { 534 'configurations': {
535 'Common_Base': { 535 'Common_Base': {
536 'msvs_target_platform': 'x64', 536 'msvs_target_platform': 'x64',
537 }, 537 },
538 }, 538 },
539 }, 539 },
540 ], 540 ],
541 }], 541 }],
542 ], 542 ],
543 } 543 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_exe.gypi » ('j') | content/content_browser.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698