embed the manifests via the project files; the warning shown is a bug in mt.exe, the manifest is properly embedded

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5403 10f7b99b-c216-0410-bff0-8a66a9350fd8

9 files changed, 48 insertions, 58 deletions

diff --git a/src/MPCTestAPI/MPCTestAPI.rc b/src/MPCTestAPI/MPCTestAPI.rc
index 6968a4053..53e18c219 100644
--- a/src/MPCTestAPI/MPCTestAPI.rc
+++ b/src/MPCTestAPI/MPCTestAPI.rc
@@ -51,14 +51,6 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// RT_MANIFEST

-//

-

-1                       RT_MANIFEST             "res\\MPCTestAPI.exe.manifest"

-

 /////////////////////////////////////////////////////////////////////////////

 //

 // Icon

diff --git a/src/MPCTestAPI/MPCTestAPI.vcxproj b/src/MPCTestAPI/MPCTestAPI.vcxproj
index 57b706e07..a7bf41223 100644
--- a/src/MPCTestAPI/MPCTestAPI.vcxproj
+++ b/src/MPCTestAPI/MPCTestAPI.vcxproj
@@ -74,30 +74,38 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\$(Configuration)_$(Platform)\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\obj\$(Configuration)_$(Platform)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\obj\$(Configuration)_$(Platform)\</IntDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <WarningLevel>Level4</WarningLevel>

     </ClCompile>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\MPCTestAPI.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <WarningLevel>Level4</WarningLevel>

     </ClCompile>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\MPCTestAPI.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <WarningLevel>Level4</WarningLevel>

     </ClCompile>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\MPCTestAPI.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <ClCompile>

       <WarningLevel>Level4</WarningLevel>

     </ClCompile>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\MPCTestAPI.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="..\thirdparty\mfc\afxctrlcontainer.cpp" />

@@ -125,9 +133,6 @@
     <ClInclude Include="stdafx.h" />

   </ItemGroup>

   <ItemGroup>

-    <Manifest Include="res\MPCTestAPI.exe.manifest" />

-  </ItemGroup>

-  <ItemGroup>

     <None Include="res\MPCTestAPI.ico">

       <FileType>ICO</FileType>

     </None>

diff --git a/src/MPCTestAPI/MPCTestAPI.vcxproj.filters b/src/MPCTestAPI/MPCTestAPI.vcxproj.filters
index ed8973544..ee895946a 100644
--- a/src/MPCTestAPI/MPCTestAPI.vcxproj.filters
+++ b/src/MPCTestAPI/MPCTestAPI.vcxproj.filters
@@ -67,9 +67,4 @@
       <Filter>Resource Files</Filter>

     </None>

   </ItemGroup>

-  <ItemGroup>

-    <Manifest Include="res\MPCTestAPI.exe.manifest">

-      <Filter>Resource Files</Filter>

-    </Manifest>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj b/src/filters/transform/VSFilter/VSFilter.vcxproj
index ea2128dbb..ba8a440d9 100644
--- a/src/filters/transform/VSFilter/VSFilter.vcxproj
+++ b/src/filters/transform/VSFilter/VSFilter.vcxproj
@@ -70,10 +70,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">$(SolutionDir)bin\Filters_x64_Debug\</OutDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">$(SolutionDir)bin\Filters_x86\</OutDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">$(SolutionDir)bin\Filters_x64\</OutDir>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">false</GenerateManifest>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">

     <ClCompile>

@@ -88,6 +84,9 @@
       <ModuleDefinitionFile>VSFilter.def</ModuleDefinitionFile>

       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\VSFilter.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">

     <ClCompile>

@@ -102,6 +101,9 @@
       <ModuleDefinitionFile>VSFilter.def</ModuleDefinitionFile>

       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\VSFilter.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">

     <ClCompile>

@@ -116,6 +118,9 @@
       <ModuleDefinitionFile>VSFilter.def</ModuleDefinitionFile>

       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\VSFilter.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">

     <ClCompile>

@@ -130,6 +135,9 @@
       <ModuleDefinitionFile>VSFilter.def</ModuleDefinitionFile>

       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\VSFilter.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp" />

@@ -209,9 +217,6 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

     </ProjectReference>

   </ItemGroup>

-  <ItemGroup>

-    <Manifest Include="res\VSFilter.manifest" />

-  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj.filters b/src/filters/transform/VSFilter/VSFilter.vcxproj.filters
index 8357ca6a0..0aeca7956 100644
--- a/src/filters/transform/VSFilter/VSFilter.vcxproj.filters
+++ b/src/filters/transform/VSFilter/VSFilter.vcxproj.filters
@@ -127,9 +127,4 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <Manifest Include="res\VSFilter.manifest">

-      <Filter>Resource Files</Filter>

-    </Manifest>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/filters/transform/VSFilter/res/VSFilter.rc2 b/src/filters/transform/VSFilter/res/VSFilter.rc2
index 7dc36b60e..8335a5d91 100644
--- a/src/filters/transform/VSFilter/res/VSFilter.rc2
+++ b/src/filters/transform/VSFilter/res/VSFilter.rc2
@@ -31,13 +31,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 /////////////////////////////////////////////////////////////////////////////

 //

-// RT_MANIFEST

-//

-

-2                       RT_MANIFEST             "res\\VSFilter.manifest"

-

-/////////////////////////////////////////////////////////////////////////////

-//

 // Version

 //

 

diff --git a/src/mpc-hc/mpc-hc.vcxproj b/src/mpc-hc/mpc-hc.vcxproj
index 633ea2cd1..d3a47a479 100644
--- a/src/mpc-hc/mpc-hc.vcxproj
+++ b/src/mpc-hc/mpc-hc.vcxproj
@@ -131,14 +131,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Lite|x64'">$(ProjectName)64</TargetName>

     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)64</TargetName>

     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(ProjectName)64</TargetName>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug Lite|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug Lite|x64'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">false</GenerateManifest>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <PreBuildEvent>

@@ -157,6 +149,9 @@
       <DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lite|Win32'">

     <PreBuildEvent>

@@ -179,6 +174,9 @@
     <ProjectReference>

       <LinkLibraryDependencies>false</LinkLibraryDependencies>

     </ProjectReference>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <PreBuildEvent>

@@ -197,6 +195,9 @@
       <DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Lite|x64'">

     <PreBuildEvent>

@@ -219,6 +220,9 @@
     <ProjectReference>

       <LinkLibraryDependencies>false</LinkLibraryDependencies>

     </ProjectReference>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <PreBuildEvent>

@@ -236,6 +240,9 @@
       <DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">

     <PreBuildEvent>

@@ -257,6 +264,9 @@
     <ProjectReference>

       <LinkLibraryDependencies>false</LinkLibraryDependencies>

     </ProjectReference>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <PreBuildEvent>

@@ -274,6 +284,9 @@
       <DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">

     <PreBuildEvent>

@@ -295,6 +308,9 @@
     <ProjectReference>

       <LinkLibraryDependencies>false</LinkLibraryDependencies>

     </ProjectReference>

+    <Manifest>

+      <AdditionalManifestFiles>$(ProjectDir)res\mpc-hc.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="..\thirdparty\mfc\afxctrlcontainer.cpp" />

diff --git a/src/mpc-hc/mpc-hc.vcxproj.filters b/src/mpc-hc/mpc-hc.vcxproj.filters
index 95bd73241..f4b8a13e0 100644
--- a/src/mpc-hc/mpc-hc.vcxproj.filters
+++ b/src/mpc-hc/mpc-hc.vcxproj.filters
@@ -983,9 +983,6 @@
     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <CustomBuildStep Include="res\mpc-hc.exe.manifest">

-      <Filter>Resource Files</Filter>

-    </CustomBuildStep>

     <CustomBuildStep Include="res\mplayerc.rc2">

       <Filter>Resource Files</Filter>

     </CustomBuildStep>

diff --git a/src/mpc-hc/res/mplayerc.rc2 b/src/mpc-hc/res/mplayerc.rc2
index e224ced27..1a26870b8 100644
--- a/src/mpc-hc/res/mplayerc.rc2
+++ b/src/mpc-hc/res/mplayerc.rc2
@@ -31,14 +31,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 /////////////////////////////////////////////////////////////////////////////

 //

-// RT_MANIFEST

-//

-

-1                       RT_MANIFEST             "res\\mpc-hc.exe.manifest"

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

 // FILE

 //