../JavaScriptCore: [Win] Update solutions and projects to support 64-bit builds.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Oct 2013 22:54:54 +0000 (22:54 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Oct 2013 22:54:54 +0000 (22:54 +0000)
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.

* JavaScriptCore.vcxproj/JavaScriptCore.submit.sln: Add an x64 target
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.submit.sln
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.submit.sln
Source/WTF/WTF.vcxproj/WTF.vcxproj
Source/WTF/WTF.vcxproj/WTF.vcxproj.filters

index 427ac69..a809e25 100644 (file)
@@ -1,3 +1,16 @@
+2013-10-03  Brent Fulgham  <bfulgham@apple.com>
+
+        [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.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.submit.sln: Add an x64 target
+        for 64-bit builds.
+
 2013-10-03  Michael Saboff  <msaboff@apple.com>
 
         Eliminate unused JITStub function declarations
index 296f59f..9fd8880 100644 (file)
@@ -26,51 +26,95 @@ EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
+               Debug|x64 = Debug|x64
                DebugSuffix|Win32 = DebugSuffix|Win32
+               DebugSuffix|x64 = DebugSuffix|x64
                Production|Win32 = Production|Win32
+               Production|x64 = Production|x64
                Release|Win32 = Release|Win32
+               Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.ActiveCfg = Debug|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.Build.0 = Debug|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.ActiveCfg = Debug|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.Build.0 = Debug|x64
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.ActiveCfg = Production|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.Build.0 = Production|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.ActiveCfg = Production|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.Build.0 = Production|x64
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.ActiveCfg = Release|Win32
                {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.Build.0 = Release|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.ActiveCfg = Release|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.Build.0 = Release|x64
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.ActiveCfg = Debug|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.Build.0 = Debug|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.ActiveCfg = Debug|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.Build.0 = Debug|x64
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.ActiveCfg = Production|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.Build.0 = Production|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.ActiveCfg = Production|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.Build.0 = Production|x64
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.ActiveCfg = Release|Win32
                {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.Build.0 = Release|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.ActiveCfg = Release|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.Build.0 = Release|x64
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.ActiveCfg = Debug|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.Build.0 = Debug|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.ActiveCfg = Debug|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.Build.0 = Debug|x64
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.ActiveCfg = Production|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.Build.0 = Production|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.ActiveCfg = Production|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.Build.0 = Production|x64
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.ActiveCfg = Release|Win32
                {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.Build.0 = Release|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.ActiveCfg = Release|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.Build.0 = Release|x64
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.ActiveCfg = Debug|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.Build.0 = Debug|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.ActiveCfg = Debug|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.Build.0 = Debug|x64
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.ActiveCfg = Production|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.Build.0 = Production|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.ActiveCfg = Production|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.Build.0 = Production|x64
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.ActiveCfg = Release|Win32
                {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.Build.0 = Release|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.ActiveCfg = Release|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.Build.0 = Release|x64
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.ActiveCfg = Debug|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.Build.0 = Debug|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.ActiveCfg = Debug|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.Build.0 = Debug|x64
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.ActiveCfg = Production|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.Build.0 = Production|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.ActiveCfg = Production|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.Build.0 = Production|x64
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.ActiveCfg = Release|Win32
                {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.Build.0 = Release|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.ActiveCfg = Release|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 877e9ca..0818b1d 100644 (file)
@@ -1,3 +1,15 @@
+2013-10-02  Brent Fulgham  <bfulgham@apple.com>
+
+        [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.
+
+
 2013-10-02  Nadav Rotem  <nrotem@apple.com>
 
         Eliminate a branch in FastBitVector setAndCheck, make it vectorizable.
index aa5a07d..aaa3d67 100644 (file)
@@ -8,27 +8,47 @@ EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
+               Debug|x64 = Debug|x64
                DebugSuffix|Win32 = DebugSuffix|Win32
+               DebugSuffix|x64 = DebugSuffix|x64
                Production|Win32 = Production|Win32
+               Production|x64 = Production|x64
                Release|Win32 = Release|Win32
+               Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.ActiveCfg = Debug|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.Build.0 = Debug|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.ActiveCfg = Debug|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.Build.0 = Debug|x64
                {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.ActiveCfg = Production|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.Build.0 = Production|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.ActiveCfg = Production|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.Build.0 = Production|x64
                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.ActiveCfg = Release|Win32
                {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.Build.0 = Release|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.ActiveCfg = Release|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.Build.0 = Release|x64
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.ActiveCfg = Debug|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.Build.0 = Debug|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.ActiveCfg = Debug|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.Build.0 = Debug|x64
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.ActiveCfg = Production|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.Build.0 = Production|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.ActiveCfg = Production|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.Build.0 = Production|x64
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.ActiveCfg = Release|Win32
                {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.Build.0 = Release|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.ActiveCfg = Release|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 39d5b5d..acda70d 100644 (file)
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\wtf\CompilationThread.h" />\r
-    <ClInclude Include="..\WTF\config.h" />\r
+    <ClInclude Include="..\config.h" />\r
     <ClInclude Include="..\wtf\ASCIICType.h" />\r
     <ClInclude Include="..\wtf\Assertions.h" />\r
     <ClInclude Include="..\wtf\Atomics.h" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
index 2bd73a3..00a51db 100644 (file)
     <ClInclude Include="..\wtf\AutodrainedPool.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\WTF\config.h" />\r
+    <ClInclude Include="..\config.h" />\r
     <ClInclude Include="..\wtf\FeatureDefines.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
     <None Include="WTFPostBuild.cmd" />\r
     <None Include="WTFPreBuild.cmd" />\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r