Title: [160402] branches/safari-537.74-branch/Tools
- Revision
- 160402
- Author
- lforsch...@apple.com
- Date
- 2013-12-10 17:11:17 -0800 (Tue, 10 Dec 2013)
Log Message
Merged r156928. <rdar://problem/15560412>
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Tools/ChangeLog (160401 => 160402)
--- branches/safari-537.74-branch/Tools/ChangeLog 2013-12-11 01:09:08 UTC (rev 160401)
+++ branches/safari-537.74-branch/Tools/ChangeLog 2013-12-11 01:11:17 UTC (rev 160402)
@@ -1,5 +1,19 @@
2013-12-10 Lucas Forschler <lforsch...@apple.com>
+ Merge r156928
+
+ 2013-10-04 Brent Fulgham <bfulg...@apple.com>
+
+ [Windows] Correct run-path when using 64-bit binaries.
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitdirs.pm:
+ (determineConfigurationProductDir): If running in 64-bit mode, use the 'bin64'
+ directory. Otherwise use the existing 'bin32' directory.
+
+2013-12-10 Lucas Forschler <lforsch...@apple.com>
+
Merge r156926
2013-10-04 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm (160401 => 160402)
--- branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-11 01:09:08 UTC (rev 160401)
+++ branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-11 01:11:17 UTC (rev 160402)
@@ -479,7 +479,7 @@
determineBaseProductDir();
determineConfiguration();
if (isAppleWinWebKit()) {
- my $binDir = "bin32";
+ my $binDir = isWin64() ? "bin64" : "bin32";
$configurationProductDir = File::Spec->catdir($baseProductDir, configurationForVisualStudio(), $binDir);
} else {
if (usesPerConfigurationBuildDirectory()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
