Changeset 156862 in webkit


Ignore:
Timestamp:
Oct 3, 2013 3:54:54 PM (10 years ago)
Author:
Brent Fulgham
Message:

../JavaScriptCore: [Win] Update solutions and projects to support 64-bit builds.
https://bugs.webkit.org/show_bug.cgi?id=122225

Reviewed by Anders Carlsson.

Revise ordering of CPU(X86) and CPU(X86_64) tests, because MSVC always defines
both when targeting a 64-bit build.

for 64-bit builds.

../WTF: [Win] Update solutions and projects to support 64-bit build.
https://bugs.webkit.org/show_bug.cgi?id=122225

Reviewed by Anders Carlsson.

  • WTF.vcxproj/WTF.submit.sln: Add x64 architecture targets.
  • WTF.vcxproj/WTF.vcxproj: Correct path to config.h file.
  • WTF.vcxproj/WTF.vcxproj.filters: Correct path to config.h file.
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r156858 r156862  
     12013-10-03  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Update solutions and projects to support 64-bit builds.
     4        https://bugs.webkit.org/show_bug.cgi?id=122225
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Revise ordering of CPU(X86) and CPU(X86_64) tests, because MSVC always defines
     9        both when targeting a 64-bit build.
     10
     11        * JavaScriptCore.vcxproj/JavaScriptCore.submit.sln: Add an x64 target
     12        for 64-bit builds.
     13
    1142013-10-03  Michael Saboff  <msaboff@apple.com>
    215
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.submit.sln

    r150995 r156862  
    2727        GlobalSection(SolutionConfigurationPlatforms) = preSolution
    2828                Debug|Win32 = Debug|Win32
     29                Debug|x64 = Debug|x64
    2930                DebugSuffix|Win32 = DebugSuffix|Win32
     31                DebugSuffix|x64 = DebugSuffix|x64
    3032                Production|Win32 = Production|Win32
     33                Production|x64 = Production|x64
    3134                Release|Win32 = Release|Win32
     35                Release|x64 = Release|x64
    3236        EndGlobalSection
    3337        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    3438                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.ActiveCfg = Debug|Win32
    3539                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.Build.0 = Debug|Win32
     40                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.ActiveCfg = Debug|x64
     41                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.Build.0 = Debug|x64
    3642                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
    3743                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
     44                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
     45                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
    3846                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.ActiveCfg = Production|Win32
    3947                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.Build.0 = Production|Win32
     48                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.ActiveCfg = Production|x64
     49                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.Build.0 = Production|x64
    4050                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.ActiveCfg = Release|Win32
    4151                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.Build.0 = Release|Win32
     52                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.ActiveCfg = Release|x64
     53                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.Build.0 = Release|x64
    4254                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.ActiveCfg = Debug|Win32
    4355                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.Build.0 = Debug|Win32
     56                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.ActiveCfg = Debug|x64
     57                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.Build.0 = Debug|x64
    4458                {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
    4559                {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
     60                {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
     61                {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
    4662                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.ActiveCfg = Production|Win32
    4763                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.Build.0 = Production|Win32
     64                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.ActiveCfg = Production|x64
     65                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.Build.0 = Production|x64
    4866                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.ActiveCfg = Release|Win32
    4967                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.Build.0 = Release|Win32
     68                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.ActiveCfg = Release|x64
     69                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.Build.0 = Release|x64
    5070                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.ActiveCfg = Debug|Win32
    5171                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.Build.0 = Debug|Win32
     72                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.ActiveCfg = Debug|x64
     73                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.Build.0 = Debug|x64
    5274                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
    5375                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
     76                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
     77                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
    5478                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.ActiveCfg = Production|Win32
    5579                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.Build.0 = Production|Win32
     80                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.ActiveCfg = Production|x64
     81                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.Build.0 = Production|x64
    5682                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.ActiveCfg = Release|Win32
    5783                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.Build.0 = Release|Win32
     84                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.ActiveCfg = Release|x64
     85                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.Build.0 = Release|x64
    5886                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.ActiveCfg = Debug|Win32
    5987                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.Build.0 = Debug|Win32
     88                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.ActiveCfg = Debug|x64
     89                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.Build.0 = Debug|x64
    6090                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
    6191                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
     92                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
     93                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
    6294                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.ActiveCfg = Production|Win32
    6395                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.Build.0 = Production|Win32
     96                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.ActiveCfg = Production|x64
     97                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.Build.0 = Production|x64
    6498                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.ActiveCfg = Release|Win32
    6599                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.Build.0 = Release|Win32
     100                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.ActiveCfg = Release|x64
     101                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.Build.0 = Release|x64
    66102                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.ActiveCfg = Debug|Win32
    67103                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.Build.0 = Debug|Win32
     104                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.ActiveCfg = Debug|x64
     105                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.Build.0 = Debug|x64
    68106                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
    69107                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
     108                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
     109                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
    70110                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.ActiveCfg = Production|Win32
    71111                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.Build.0 = Production|Win32
     112                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.ActiveCfg = Production|x64
     113                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.Build.0 = Production|x64
    72114                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.ActiveCfg = Release|Win32
    73115                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.Build.0 = Release|Win32
     116                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.ActiveCfg = Release|x64
     117                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.Build.0 = Release|x64
    74118        EndGlobalSection
    75119        GlobalSection(SolutionProperties) = preSolution
  • trunk/Source/WTF/ChangeLog

    r156792 r156862  
     12013-10-02  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Update solutions and projects to support 64-bit build.
     4        https://bugs.webkit.org/show_bug.cgi?id=122225
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WTF.vcxproj/WTF.submit.sln: Add x64 architecture targets.
     9        * WTF.vcxproj/WTF.vcxproj: Correct path to config.h file.
     10        * WTF.vcxproj/WTF.vcxproj.filters: Correct path to config.h file.
     11
     12
    1132013-10-02  Nadav Rotem  <nrotem@apple.com>
    214
  • trunk/Source/WTF/WTF.vcxproj/WTF.submit.sln

    r143529 r156862  
    99        GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1010                Debug|Win32 = Debug|Win32
     11                Debug|x64 = Debug|x64
    1112                DebugSuffix|Win32 = DebugSuffix|Win32
     13                DebugSuffix|x64 = DebugSuffix|x64
    1214                Production|Win32 = Production|Win32
     15                Production|x64 = Production|x64
    1316                Release|Win32 = Release|Win32
     17                Release|x64 = Release|x64
    1418        EndGlobalSection
    1519        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    1620                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.ActiveCfg = Debug|Win32
    1721                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.Build.0 = Debug|Win32
     22                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.ActiveCfg = Debug|x64
     23                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.Build.0 = Debug|x64
    1824                {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
    1925                {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
     26                {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
     27                {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
    2028                {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.ActiveCfg = Production|Win32
    2129                {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.Build.0 = Production|Win32
     30                {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.ActiveCfg = Production|x64
     31                {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.Build.0 = Production|x64
    2232                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.ActiveCfg = Release|Win32
    2333                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.Build.0 = Release|Win32
     34                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.ActiveCfg = Release|x64
     35                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.Build.0 = Release|x64
    2436                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.ActiveCfg = Debug|Win32
    2537                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.Build.0 = Debug|Win32
     38                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.ActiveCfg = Debug|x64
     39                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.Build.0 = Debug|x64
    2640                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
    2741                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
     42                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
     43                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
    2844                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.ActiveCfg = Production|Win32
    2945                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.Build.0 = Production|Win32
     46                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.ActiveCfg = Production|x64
     47                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.Build.0 = Production|x64
    3048                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.ActiveCfg = Release|Win32
    3149                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.Build.0 = Release|Win32
     50                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.ActiveCfg = Release|x64
     51                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.Build.0 = Release|x64
    3252        EndGlobalSection
    3353        GlobalSection(SolutionProperties) = preSolution
  • trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj

    r156298 r156862  
    117117  <ItemGroup>
    118118    <ClInclude Include="..\wtf\CompilationThread.h" />
    119     <ClInclude Include="..\WTF\config.h" />
     119    <ClInclude Include="..\config.h" />
    120120    <ClInclude Include="..\wtf\ASCIICType.h" />
    121121    <ClInclude Include="..\wtf\Assertions.h" />
  • trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters

    r156298 r156862  
    639639      <Filter>wtf</Filter>
    640640    </ClInclude>
    641     <ClInclude Include="..\WTF\config.h" />
     641    <ClInclude Include="..\config.h" />
    642642    <ClInclude Include="..\wtf\FeatureDefines.h">
    643643      <Filter>wtf</Filter>
Note: See TracChangeset for help on using the changeset viewer.