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

Side by Side Diff: tools/gyp/v8.gyp

Issue 100160: Fix .gyp file and avoid adding -m32 on 32 bit systems. (Closed)
Patch Set: Created 11 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
OLDNEW
1 # Copyright 2009 the V8 project authors. All rights reserved. 1 # Copyright 2009 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 ], 393 ],
394 'action': ['python', '../../tools/js2c.py', '<@(_outputs)', 'D8', '<@( library_files)'], 394 'action': ['python', '../../tools/js2c.py', '<@(_outputs)', 'D8', '<@( library_files)'],
395 }, 395 },
396 ], 396 ],
397 }, 397 },
398 398
399 # Targets to build v8 for the native architecture (ia32). 399 # Targets to build v8 for the native architecture (ia32).
400 { 400 {
401 'target_name': 'v8_base', 401 'target_name': 'v8_base',
402 'type': '<(library)', 402 'type': '<(library)',
403 'defines': [
404 'V8_ARCH_IA32'
405 ],
403 'include_dirs+': [ 406 'include_dirs+': [
404 '../../src', 407 '../../src',
405 '../../src/ia32', 408 '../../src/ia32',
406 ], 409 ],
407 'msvs_guid': 'EC8B7909-62AF-470D-A75D-E1D89C837142', 410 'msvs_guid': 'EC8B7909-62AF-470D-A75D-E1D89C837142',
408 'sources': [ 411 'sources': [
409 '<@(base_source_files)', 412 '<@(base_source_files)',
410 ], 413 ],
411 'sources!': [ 414 'sources!': [
412 '<@(not_base_source_files)', 415 '<@(not_base_source_files)',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 'msvs_disabled_warnings': [4355, 4800, 4018, 4244], 451 'msvs_disabled_warnings': [4355, 4800, 4018, 4244],
449 'link_settings': { 452 'link_settings': {
450 'libraries': [ '-lwinmm.lib' ], 453 'libraries': [ '-lwinmm.lib' ],
451 }, 454 },
452 }], 455 }],
453 ], 456 ],
454 }, 457 },
455 { 458 {
456 'target_name': 'v8_nosnapshot', 459 'target_name': 'v8_nosnapshot',
457 'type': '<(library)', 460 'type': '<(library)',
461 'defines': [
462 'V8_ARCH_IA32'
463 ],
458 'dependencies': [ 464 'dependencies': [
459 'js2c', 465 'js2c',
460 'v8_base', 466 'v8_base',
461 ], 467 ],
462 'include_dirs': [ 468 'include_dirs': [
463 '../../src', 469 '../../src',
464 ], 470 ],
465 'sources': [ 471 'sources': [
466 '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', 472 '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
467 '../../src/snapshot-empty.cc', 473 '../../src/snapshot-empty.cc',
468 ], 474 ],
469 'export_dependent_settings': [ 475 'export_dependent_settings': [
470 'v8_base', 476 'v8_base',
471 ], 477 ],
472 }, 478 },
473 { 479 {
474 'target_name': 'mksnapshot', 480 'target_name': 'mksnapshot',
475 'type': 'executable', 481 'type': 'executable',
476 'dependencies': [ 482 'dependencies': [
477 'v8_nosnapshot', 483 'v8_nosnapshot',
478 ], 484 ],
479 'msvs_guid': '865575D0-37E2-405E-8CBA-5F6C485B5A26', 485 'msvs_guid': '865575D0-37E2-405E-8CBA-5F6C485B5A26',
480 'sources': [ 486 'sources': [
481 '../../src/mksnapshot.cc', 487 '../../src/mksnapshot.cc',
482 ], 488 ],
483 }, 489 },
484 { 490 {
485 'target_name': 'v8', 491 'target_name': 'v8',
486 'type': '<(library)', 492 'type': '<(library)',
493 'defines': [
494 'V8_ARCH_IA32'
495 ],
487 'dependencies': [ 496 'dependencies': [
488 'js2c', 497 'js2c',
489 'mksnapshot', 498 'mksnapshot',
490 'v8_base', 499 'v8_base',
491 ], 500 ],
492 'msvs_guid': '21E22961-22BF-4493-BD3A-868F93DA5179', 501 'msvs_guid': '21E22961-22BF-4493-BD3A-868F93DA5179',
493 'actions': [ 502 'actions': [
494 { 503 {
495 'action_name': 'mksnapshot', 504 'action_name': 'mksnapshot',
496 'inputs': [ 505 'inputs': [
(...skipping 17 matching lines...) Expand all
514 '../../include', 523 '../../include',
515 ], 524 ],
516 }, 525 },
517 'export_dependent_settings': [ 526 'export_dependent_settings': [
518 'v8_base', 527 'v8_base',
519 ], 528 ],
520 }, 529 },
521 { 530 {
522 'target_name': 'v8_shell', 531 'target_name': 'v8_shell',
523 'type': 'executable', 532 'type': 'executable',
533 'defines': [
534 'V8_ARCH_IA32'
535 ],
524 'dependencies': [ 536 'dependencies': [
525 'v8', 537 'v8',
526 ], 538 ],
527 'sources': [ 539 'sources': [
528 '../../samples/shell.cc', 540 '../../samples/shell.cc',
529 ], 541 ],
530 'conditions': [ 542 'conditions': [
531 [ 'OS=="win"', { 543 [ 'OS=="win"', {
532 # This could be gotten by not setting chromium_code, if that's OK. 544 # This could be gotten by not setting chromium_code, if that's OK.
533 'defines': ['_CRT_SECURE_NO_WARNINGS'], 545 'defines': ['_CRT_SECURE_NO_WARNINGS'],
534 }], 546 }],
535 ], 547 ],
536 }, 548 },
537 ], 549 ],
538 550
539 'conditions': [ ['OS=="mac"', { 'targets': [ 551 'conditions': [ ['OS=="mac"', { 'targets': [
540 # TODO(bradnelson): temporarily disable 'd8' target on Windows while 552 # TODO(bradnelson): temporarily disable 'd8' target on Windows while
541 # we work fix the performance regressions. 553 # we work fix the performance regressions.
542 # TODO(sgk): temporarily disable 'd8' target on Linux while 554 # TODO(sgk): temporarily disable 'd8' target on Linux while
543 # we work out getting the readline library on all the systems. 555 # we work out getting the readline library on all the systems.
544 { 556 {
545 'target_name': 'd8', 557 'target_name': 'd8',
546 'type': 'executable', 558 'type': 'executable',
547 'dependencies': [ 559 'dependencies': [
548 'd8_js2c', 560 'd8_js2c',
549 'v8', 561 'v8',
550 ], 562 ],
563 'defines': [
564 'V8_ARCH_IA32'
565 ],
551 'include_dirs': [ 566 'include_dirs': [
552 '../../src', 567 '../../src',
553 ], 568 ],
554 'sources': [ 569 'sources': [
555 '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', 570 '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
556 '<@(d8_source_files)', 571 '<@(d8_source_files)',
557 ], 572 ],
558 'conditions': [ 573 'conditions': [
559 [ 'OS=="linux"', { 574 [ 'OS=="linux"', {
560 'sources!': [ '../../src/d8-windows.cc' ], 575 'sources!': [ '../../src/d8-windows.cc' ],
(...skipping 17 matching lines...) Expand all
578 # 593 #
579 # ARM targets, to test ARM code generation. These use an ARM simulator 594 # ARM targets, to test ARM code generation. These use an ARM simulator
580 # (src/simulator-arm.cc). The ARM targets are not snapshot-enabled. 595 # (src/simulator-arm.cc). The ARM targets are not snapshot-enabled.
581 { 596 {
582 'target_name': 'v8_arm', 597 'target_name': 'v8_arm',
583 'type': '<(library)', 598 'type': '<(library)',
584 'dependencies': [ 599 'dependencies': [
585 'js2c', 600 'js2c',
586 ], 601 ],
587 'defines': [ 602 'defines': [
588 'ARM', 603 'V8_ARCH_ARM',
589 ], 604 ],
590 'include_dirs+': [ 605 'include_dirs+': [
591 '../../src', 606 '../../src',
592 '../../src/arm', 607 '../../src/arm',
593 ], 608 ],
594 'sources': [ 609 'sources': [
595 '<@(base_source_files)', 610 '<@(base_source_files)',
596 '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', 611 '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
597 '../../src/snapshot-empty.cc', 612 '../../src/snapshot-empty.cc',
598 ], 613 ],
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 }], 651 }],
637 ], 652 ],
638 }, 653 },
639 { 654 {
640 'target_name': 'v8_shell_arm', 655 'target_name': 'v8_shell_arm',
641 'type': 'executable', 656 'type': 'executable',
642 'dependencies': [ 657 'dependencies': [
643 'v8_arm', 658 'v8_arm',
644 ], 659 ],
645 'defines': [ 660 'defines': [
646 'ARM', 661 'V8_ARCH_ARM',
647 ], 662 ],
648 'sources': [ 663 'sources': [
649 '../../samples/shell.cc', 664 '../../samples/shell.cc',
650 ], 665 ],
651 'conditions': [ 666 'conditions': [
652 [ 'OS=="win"', { 667 [ 'OS=="win"', {
653 # This could be gotten by not setting chromium_code, if that's OK. 668 # This could be gotten by not setting chromium_code, if that's OK.
654 'defines': ['_CRT_SECURE_NO_WARNINGS'], 669 'defines': ['_CRT_SECURE_NO_WARNINGS'],
655 }], 670 }],
656 ], 671 ],
657 }, 672 },
658 { 673 {
659 'target_name': 'd8_arm', 674 'target_name': 'd8_arm',
660 'type': 'executable', 675 'type': 'executable',
661 'dependencies': [ 676 'dependencies': [
662 'd8_js2c', 677 'd8_js2c',
663 'v8_arm', 678 'v8_arm',
664 ], 679 ],
665 'defines': [ 680 'defines': [
666 'ARM', 681 'V8_ARCH_ARM',
667 ], 682 ],
668 'include_dirs': [ 683 'include_dirs': [
669 '../../src', 684 '../../src',
670 ], 685 ],
671 'sources': [ 686 'sources': [
672 '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', 687 '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
673 '<@(d8_source_files)', 688 '<@(d8_source_files)',
674 ], 689 ],
675 'conditions': [ 690 'conditions': [
676 [ 'OS=="linux"', { 691 [ 'OS=="linux"', {
(...skipping 23 matching lines...) Expand all
700 ], 715 ],
701 'msvs_settings': { 716 'msvs_settings': {
702 'VCLinkerTool': { 717 'VCLinkerTool': {
703 'AdditionalOptions': '/IGNORE:4221 /NXCOMPAT', 718 'AdditionalOptions': '/IGNORE:4221 /NXCOMPAT',
704 }, 719 },
705 }, 720 },
706 }, 721 },
707 }], 722 }],
708 ], 723 ],
709 } 724 }
OLDNEW
« SConstruct ('K') | « SConstruct ('k') | tools/visual_studio/ia32.vsprops » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698