Title: [150080] trunk/Tools
- Revision
- 150080
- Author
- bfulg...@apple.com
- Date
- 2013-05-14 10:57:12 -0700 (Tue, 14 May 2013)
Log Message
[Windows] Switch to embedded manifest commands for launcher executables.
https://bugs.webkit.org/show_bug.cgi?id=116109
Reviewed by Darin Adler.
* WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj: Remove the
now-unused WinLauncher.exe.manifest file.
* WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters: Ditto.
* win/DLLLauncher/DLLLauncherMain.cpp: Add embedded manifest command
when building with VS2010 or newer.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (150079 => 150080)
--- trunk/Tools/ChangeLog 2013-05-14 17:55:42 UTC (rev 150079)
+++ trunk/Tools/ChangeLog 2013-05-14 17:57:12 UTC (rev 150080)
@@ -1,5 +1,18 @@
2013-05-14 Brent Fulgham <bfulg...@apple.com>
+ [Windows] Switch to embedded manifest commands for launcher executables.
+ https://bugs.webkit.org/show_bug.cgi?id=116109
+
+ Reviewed by Darin Adler.
+
+ * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj: Remove the
+ now-unused WinLauncher.exe.manifest file.
+ * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters: Ditto.
+ * win/DLLLauncher/DLLLauncherMain.cpp: Add embedded manifest command
+ when building with VS2010 or newer.
+
+2013-05-14 Brent Fulgham <bfulg...@apple.com>
+
[Windows] Update ORWT to know about the Windows 8 SDK and Debug Tools.
https://bugs.webkit.org/show_bug.cgi?id=116079
Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj (150079 => 150080)
--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj 2013-05-14 17:55:42 UTC (rev 150079)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj 2013-05-14 17:57:12 UTC (rev 150080)
@@ -104,9 +104,6 @@
<None Include="WinLauncherPostBuild.cmd" />
<None Include="WinLauncherPreBuild.cmd" />
</ItemGroup>
- <ItemGroup>
- <Manifest Include="WinLauncher.exe.manifest" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters (150079 => 150080)
--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters 2013-05-14 17:55:42 UTC (rev 150079)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters 2013-05-14 17:57:12 UTC (rev 150080)
@@ -30,9 +30,4 @@
<None Include="WinLauncherPostBuild.cmd" />
<None Include="WinLauncherPreBuild.cmd" />
</ItemGroup>
- <ItemGroup>
- <Manifest Include="WinLauncher.exe.manifest">
- <Filter>Resource Files</Filter>
- </Manifest>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (150079 => 150080)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-05-14 17:55:42 UTC (rev 150079)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-05-14 17:57:12 UTC (rev 150080)
@@ -48,6 +48,9 @@
#endif
#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.6195' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='1fc8b3b9a1e18e3b' language='*'\"")
+#endif
static void enableTerminationOnHeapCorruption()
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
