[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.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index de1521d..7364129 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,18 @@
 2013-05-14  Brent Fulgham  <bfulgham@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  <bfulgham@apple.com>
+
         [Windows] Update ORWT to know about the Windows 8 SDK and Debug Tools.
         https://bugs.webkit.org/show_bug.cgi?id=116079
 

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
index f116f42..7307de6 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
@@ -104,9 +104,6 @@
     <None Include="WinLauncherPostBuild.cmd" />\r
     <None Include="WinLauncherPreBuild.cmd" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Manifest Include="WinLauncher.exe.manifest" />\r
-  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters
index 8b74721..9bdcce3 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters
@@ -30,9 +30,4 @@
     <None Include="WinLauncherPostBuild.cmd" />\r
     <None Include="WinLauncherPreBuild.cmd" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Manifest Include="WinLauncher.exe.manifest">\r
-      <Filter>Resource Files</Filter>\r
-    </Manifest>\r
-  </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
index 961335d..68ebe96 100644 (file)
--- a/Tools/win/DLLLauncher/DLLLauncherMain.cpp
+++ b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
@@ -48,6 +48,9 @@ using namespace std;
 #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()
 {