Changeset 156290 in webkit

Timestamp:

Sep 23, 2013 1:38:36 PM (11 years ago)

Author:

alex.christensen@flexsim.com

Message:

Added --64-bit option for Windows build.
​https://bugs.webkit.org/show_bug.cgi?id=121799

Reviewed by Brent Fulgham.

• Scripts/webkitdirs.pm:

(determinePassedConfiguration): Add "|x64" for 64-bit configuration.
(isWin64): Added.
(determineIsWin64): Added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-23  Alex Christensen  <alex.christensen@flexsim.com>
+
+        Added --64-bit option for Windows build.
+        https://bugs.webkit.org/show_bug.cgi?id=121799
+
+        Reviewed by Brent Fulgham.
+
+        * Scripts/webkitdirs.pm:
+        (determinePassedConfiguration): Add "|x64" for 64-bit configuration.
+        (isWin64): Added.
+        (determineIsWin64): Added.
+
 2013-09-23  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -95 +95 @@
 my $isWinCE;
 my $isWinCairo;
+my $isWin64;
 my $isEfl;
 my $isBlackBerry;
@@ -624 +625 @@
             $passedConfiguration = "Debug";
             $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+            $passedConfiguration .= "|x64" if isWin64();
             return;
         }
@@ -630 +632 @@
             $passedConfiguration = "Release";
             $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+            $passedConfiguration .= "|x64" if isWin64();
             return;
         }
@@ -636 +639 @@
             $passedConfiguration = "Profiling";
             $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+            $passedConfiguration .= "|x64" if isWin64();
             return;
         }
@@ -1196 +1200 @@
     return if defined($isWinCairo);
     $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
+}
+
+sub isWin64()
+{
+    determineIsWin64();
+    return $isWin64;
+}
+
+sub determineIsWin64()
+{
+    return if defined($isWin64);
+    $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit");
 }