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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | « third_party/WebKit/JavaScriptCore/JavaScriptCore.scons ('k') | third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <<<<<<< .working 1 <<<<<<< .working
2 <?xml version="1.0" encoding="windows-1251"?> 2 <?xml version="1.0" encoding="windows-1251"?>
3 <VisualStudioProject 3 <VisualStudioProject
4 ProjectType="Visual C++" 4 ProjectType="Visual C++"
5 Version="8,00" 5 Version="8,00"
6 Name="WTF" 6 Name="WTF"
7 ProjectGUID="{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" 7 ProjectGUID="{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
8 RootNamespace="WTF" 8 RootNamespace="WTF"
9 Keyword="Win32Proj" 9 Keyword="Win32Proj"
10 > 10 >
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 </File> 441 </File>
442 <File 442 <File
443 RelativePath="..\..\wtf\ThreadSpecific.h" 443 RelativePath="..\..\wtf\ThreadSpecific.h"
444 > 444 >
445 </File> 445 </File>
446 <File 446 <File
447 RelativePath="..\..\wtf\ThreadSpecificWin.cpp" 447 RelativePath="..\..\wtf\ThreadSpecificWin.cpp"
448 > 448 >
449 </File> 449 </File>
450 <File 450 <File
451 RelativePath="..\..\wtf\TypeTraits.cpp" 451 RelativePath="..\..\wtf\unicode\Unicode.h"
452 >
453 </File>
454 <File
455 RelativePath="..\..\wtf\unicode\icu\UnicodeIcu.h"
456 >
457 </File>
458 <File
459 RelativePath="..\..\wtf\UnusedParam.h"
460 >
461 </File>
462 <File
463 RelativePath="..\..\wtf\unicode\UTF8.cpp"
464 >
465 </File>
466 <File
467 RelativePath="..\..\wtf\unicode\UTF8.h"
468 >
469 </File>
470 <File
471 RelativePath="..\..\wtf\Vector.h"
472 >
473 </File>
474 <File
475 RelativePath="..\..\wtf\VectorTraits.h"
476 >
477 </File>
478 </Files>
479 <Globals>
480 </Globals>
481 </VisualStudioProject>
482
483 =======
484 <?xml version="1.0" encoding="windows-1251"?>
485 <VisualStudioProject
486 ProjectType="Visual C++"
487 Version="8,00"
488 Name="WTF"
489 ProjectGUID="{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
490 RootNamespace="WTF"
491 Keyword="Win32Proj"
492 >
493 <Platforms>
494 <Platform
495 Name="Win32"
496 />
497 </Platforms>
498 <ToolFiles>
499 </ToolFiles>
500 <Configurations>
501 <Configuration
502 Name="Debug|Win32"
503 OutputDirectory="$(WebKitOutputDir)\lib"
504 ConfigurationType="4"
505 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsp rops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"
506 CharacterSet="1"
507 >
508 <Tool
509 Name="VCPreBuildEventTool"
510 CommandLine="set PATH=%SystemDrive%\cygwin\bin;% PATH%&#x0D;&#x0A;"
511 />
512 <Tool
513 Name="VCCustomBuildTool"
514 Description=""
515 CommandLine=""
516 />
517 <Tool
518 Name="VCXMLDataGeneratorTool"
519 />
520 <Tool
521 Name="VCWebServiceProxyGeneratorTool"
522 />
523 <Tool
524 Name="VCMIDLTool"
525 />
526 <Tool
527 Name="VCCLCompilerTool"
528 AdditionalIncludeDirectories="&quot;$(WebKitOutp utDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quo t;../../os-win32/&quot;;../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/; &quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\ic u&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni; &quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir )\include\pthreads&quot;"
529 PreprocessorDefinitions="__STD_C"
530 ForcedIncludeFiles=""
531 />
532 <Tool
533 Name="VCManagedResourceCompilerTool"
534 />
535 <Tool
536 Name="VCResourceCompilerTool"
537 />
538 <Tool
539 Name="VCPreLinkEventTool"
540 />
541 <Tool
542 Name="VCLibrarianTool"
543 AdditionalDependencies="user32.lib"
544 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConf igSuffix).lib"
545 />
546 <Tool
547 Name="VCALinkTool"
548 />
549 <Tool
550 Name="VCXDCMakeTool"
551 />
552 <Tool
553 Name="VCBscMakeTool"
554 />
555 <Tool
556 Name="VCFxCopTool"
557 />
558 <Tool
559 Name="VCPostBuildEventTool"
560 CommandLine="if exist &quot;$(WebKitOutputDir)\b uildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
561 />
562 </Configuration>
563 <Configuration
564 Name="Release|Win32"
565 OutputDirectory="$(WebKitOutputDir)\lib"
566 ConfigurationType="4"
567 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsp rops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"
568 CharacterSet="1"
569 WholeProgramOptimization="1"
570 >
571 <Tool
572 Name="VCPreBuildEventTool"
573 CommandLine="set PATH=%SystemDrive%\cygwin\bin;% PATH%&#x0D;&#x0A;"
574 />
575 <Tool
576 Name="VCCustomBuildTool"
577 Description=""
578 CommandLine=""
579 />
580 <Tool
581 Name="VCXMLDataGeneratorTool"
582 />
583 <Tool
584 Name="VCWebServiceProxyGeneratorTool"
585 />
586 <Tool
587 Name="VCMIDLTool"
588 />
589 <Tool
590 Name="VCCLCompilerTool"
591 AdditionalIncludeDirectories="&quot;$(WebKitOutp utDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quo t;../../os-win32/&quot;;../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/; &quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\ic u&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni; &quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir )\include\pthreads&quot;"
592 PreprocessorDefinitions="__STD_C"
593 ForcedIncludeFiles=""
594 />
595 <Tool
596 Name="VCManagedResourceCompilerTool"
597 />
598 <Tool
599 Name="VCResourceCompilerTool"
600 />
601 <Tool
602 Name="VCPreLinkEventTool"
603 />
604 <Tool
605 Name="VCLibrarianTool"
606 AdditionalDependencies="user32.lib"
607 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConf igSuffix).lib"
608 />
609 <Tool
610 Name="VCALinkTool"
611 />
612 <Tool
613 Name="VCXDCMakeTool"
614 />
615 <Tool
616 Name="VCBscMakeTool"
617 />
618 <Tool
619 Name="VCFxCopTool"
620 />
621 <Tool
622 Name="VCPostBuildEventTool"
623 CommandLine="if exist &quot;$(WebKitOutputDir)\b uildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
624 />
625 </Configuration>
626 <Configuration
627 Name="Debug_Internal|Win32"
628 OutputDirectory="$(WebKitOutputDir)\lib"
629 ConfigurationType="4"
630 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsp rops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLi brariesDir)\tools\vsprops\debug_internal.vsprops"
631 CharacterSet="1"
632 >
633 <Tool
634 Name="VCPreBuildEventTool"
635 CommandLine="set PATH=%SystemDrive%\cygwin\bin;% PATH%&#x0D;&#x0A;"
636 />
637 <Tool
638 Name="VCCustomBuildTool"
639 Description=""
640 CommandLine=""
641 />
642 <Tool
643 Name="VCXMLDataGeneratorTool"
644 />
645 <Tool
646 Name="VCWebServiceProxyGeneratorTool"
647 />
648 <Tool
649 Name="VCMIDLTool"
650 />
651 <Tool
652 Name="VCCLCompilerTool"
653 AdditionalIncludeDirectories="&quot;$(WebKitOutp utDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quo t;../../os-win32/&quot;;../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/; &quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\ic u&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni; &quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir )\include\pthreads&quot;"
654 PreprocessorDefinitions="__STD_C"
655 ForcedIncludeFiles=""
656 />
657 <Tool
658 Name="VCManagedResourceCompilerTool"
659 />
660 <Tool
661 Name="VCResourceCompilerTool"
662 />
663 <Tool
664 Name="VCPreLinkEventTool"
665 />
666 <Tool
667 Name="VCLibrarianTool"
668 AdditionalDependencies="user32.lib"
669 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConf igSuffix).lib"
670 />
671 <Tool
672 Name="VCALinkTool"
673 />
674 <Tool
675 Name="VCXDCMakeTool"
676 />
677 <Tool
678 Name="VCBscMakeTool"
679 />
680 <Tool
681 Name="VCFxCopTool"
682 />
683 <Tool
684 Name="VCPostBuildEventTool"
685 CommandLine="if exist &quot;$(WebKitOutputDir)\b uildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
686 />
687 </Configuration>
688 </Configurations>
689 <References>
690 </References>
691 <Files>
692 <Filter
693 Name="win"
694 >
695 <File
696 RelativePath="..\..\wtf\win\MainThreadWin.cpp"
697 >
698 </File>
699 </Filter>
700 <File
701 RelativePath="..\..\wtf\AlwaysInline.h"
702 >
703 </File>
704 <File
705 RelativePath="..\..\wtf\ASCIICType.h"
706 >
707 </File>
708 <File
709 RelativePath="..\..\wtf\Assertions.cpp"
710 >
711 </File>
712 <File
713 RelativePath="..\..\wtf\Assertions.h"
714 >
715 </File>
716 <File
717 RelativePath="..\..\wtf\unicode\Collator.h"
718 >
719 </File>
720 <File
721 RelativePath="..\..\wtf\unicode\CollatorDefault.cpp"
722 >
723 </File>
724 <File
725 RelativePath="..\..\wtf\unicode\icu\CollatorICU.cpp"
726 >
727 </File>
728 <File
729 RelativePath="..\..\wtf\CurrentTime.cpp"
730 >
731 </File>
732 <File
733 RelativePath="..\..\wtf\CurrentTime.h"
734 >
735 </File>
736 <File
737 RelativePath="..\..\wtf\Deque.h"
738 >
739 </File>
740 <File
741 RelativePath="..\..\wtf\dtoa.cpp"
742 >
743 </File>
744 <File
745 RelativePath="..\..\wtf\dtoa.h"
746 >
747 </File>
748 <File
749 RelativePath="..\..\wtf\FastMalloc.cpp"
750 >
751 </File>
752 <File
753 RelativePath="..\..\wtf\FastMalloc.h"
754 >
755 </File>
756 <File
757 RelativePath="..\..\wtf\FastMallocInternal.h"
758 >
759 </File>
760 <File
761 RelativePath="..\..\wtf\Forward.h"
762 >
763 </File>
764 <File
765 RelativePath="..\..\wtf\GetPtr.h"
766 >
767 </File>
768 <File
769 RelativePath="..\..\wtf\HashCountedSet.h"
770 >
771 </File>
772 <File
773 RelativePath="..\..\wtf\HashFunctions.h"
774 >
775 </File>
776 <File
777 RelativePath="..\..\wtf\HashMap.h"
778 >
779 </File>
780 <File
781 RelativePath="..\..\wtf\HashSet.h"
782 >
783 </File>
784 <File
785 RelativePath="..\..\wtf\HashTable.cpp"
786 >
787 </File>
788 <File
789 RelativePath="..\..\wtf\HashTable.h"
790 >
791 </File>
792 <File
793 RelativePath="..\..\wtf\HashTraits.h"
794 >
795 </File>
796 <File
797 RelativePath="..\..\wtf\ListHashSet.h"
798 >
799 </File>
800 <File
801 RelativePath="..\..\wtf\ListRefPtr.h"
802 >
803 </File>
804 <File
805 RelativePath="..\..\wtf\Locker.h"
806 >
807 </File>
808 <File
809 RelativePath="..\..\wtf\MainThread.cpp"
810 >
811 </File>
812 <File
813 RelativePath="..\..\wtf\MainThread.h"
814 >
815 </File>
816 <File
817 RelativePath="..\..\wtf\MathExtras.h"
818 >
819 </File>
820 <File
821 RelativePath="..\..\wtf\MessageQueue.h"
822 >
823 </File>
824 <File
825 RelativePath="..\..\wtf\Noncopyable.h"
826 >
827 </File>
828 <File
829 RelativePath="..\..\wtf\NotFound.h"
830 >
831 </File>
832 <File
833 RelativePath="..\..\wtf\OwnArrayPtr.h"
834 >
835 </File>
836 <File
837 RelativePath="..\..\wtf\OwnPtr.h"
838 >
839 </File>
840 <File
841 RelativePath="..\..\wtf\OwnPtrWin.cpp"
842 >
843 </File>
844 <File
845 RelativePath="..\..\wtf\PassRefPtr.h"
846 >
847 </File>
848 <File
849 RelativePath="..\..\wtf\Platform.h"
850 >
851 </File>
852 <File
853 RelativePath="..\..\wtf\PtrAndFlags.h"
854 >
855 </File>
856 <File
857 RelativePath="..\..\wtf\RandomNumber.cpp"
858 >
859 </File>
860 <File
861 RelativePath="..\..\wtf\RandomNumber.h"
862 >
863 </File>
864 <File
865 RelativePath="..\..\wtf\RandomNumberSeed.h"
866 >
867 </File>
868 <File
869 RelativePath="..\..\wtf\RefCounted.h"
870 >
871 </File>
872 <File
873 RelativePath="..\..\wtf\RefCountedLeakCounter.cpp"
874 >
875 </File>
876 <File
877 RelativePath="..\..\wtf\RefPtr.h"
878 >
879 </File>
880 <File
881 RelativePath="..\..\wtf\RefPtrHashMap.h"
882 >
883 </File>
884 <File
885 RelativePath="..\..\wtf\RetainPtr.h"
886 >
887 </File>
888 <File
889 RelativePath="..\..\wtf\StdLibExtras.h"
890 >
891 </File>
892 <File
893 RelativePath="..\..\wtf\StringExtras.h"
894 >
895 </File>
896 <File
897 RelativePath="..\..\wtf\TCPackedCache.h"
898 >
899 </File>
900 <File
901 RelativePath="..\..\wtf\TCPageMap.h"
902 >
903 </File>
904 <File
905 RelativePath="..\..\wtf\TCSpinLock.h"
906 >
907 </File>
908 <File
909 RelativePath="..\..\wtf\TCSystemAlloc.cpp"
910 >
911 </File>
912 <File
913 RelativePath="..\..\wtf\TCSystemAlloc.h"
914 >
915 </File>
916 <File
917 RelativePath="..\..\wtf\Threading.cpp"
452 > 918 >
453 </File> 919 </File>
454 <File 920 <File
455 RelativePath="..\..\wtf\Threading.h" 921 RelativePath="..\..\wtf\Threading.h"
456 > 922 >
457 </File> 923 </File>
458 <File 924 <File
459 RelativePath="..\..\wtf\ThreadingWin.cpp" 925 RelativePath="..\..\wtf\ThreadingWin.cpp"
460 > 926 >
461 </File> 927 </File>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 </File> 963 </File>
498 <File 964 <File
499 RelativePath="..\..\wtf\VectorTraits.h" 965 RelativePath="..\..\wtf\VectorTraits.h"
500 > 966 >
501 </File> 967 </File>
502 </Files> 968 </Files>
503 <Globals> 969 <Globals>
504 </Globals> 970 </Globals>
505 </VisualStudioProject> 971 </VisualStudioProject>
506 >>>>>>> .merge-right.r39829 972 >>>>>>> .merge-right.r39829
OLDNEW
« no previous file with comments | « third_party/WebKit/JavaScriptCore/JavaScriptCore.scons ('k') | third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698