embed the manifest files directly via the rc files

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

10 files changed, 33 insertions, 46 deletions

diff --git a/src/apps/MPCTestAPI/MPCTestAPI.rc b/src/apps/MPCTestAPI/MPCTestAPI.rc
index 10dd3c9ee..e3092f166 100644
--- a/src/apps/MPCTestAPI/MPCTestAPI.rc
+++ b/src/apps/MPCTestAPI/MPCTestAPI.rc
@@ -57,7 +57,7 @@ END
 // RT_MANIFEST

 //

 

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

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

 

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

 //

diff --git a/src/apps/MPCTestAPI/res/MPCTestAPI.exe.manifest b/src/apps/MPCTestAPI/res/MPCTestAPI.exe.manifest
index bbd45feeb..355f088b5 100644
--- a/src/apps/MPCTestAPI/res/MPCTestAPI.exe.manifest
+++ b/src/apps/MPCTestAPI/res/MPCTestAPI.exe.manifest
@@ -19,8 +19,7 @@
       />

     </dependentAssembly>

   </dependency>

-  <!-- Identify the application security requirements -->

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">

+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

     <security>

       <requestedPrivileges>

         <requestedExecutionLevel

@@ -32,15 +31,13 @@
   </trustInfo>

   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">

     <application>

-      <!--The ID below indicates application support for Windows Vista -->

       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>

-      <!--The ID below indicates application support for Windows 7 -->

       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>

     </application>

   </compatibility>

   <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">

     <asmv3:windowsSettings

-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

+        xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

       <dpiAware>true</dpiAware>

     </asmv3:windowsSettings>

   </asmv3:application>

diff --git a/src/apps/MPCTestAPI/resource.h b/src/apps/MPCTestAPI/resource.h
index 25a16d4a0..f41d70f23 100644
--- a/src/apps/MPCTestAPI/resource.h
+++ b/src/apps/MPCTestAPI/resource.h
@@ -2,7 +2,6 @@
 // Microsoft Visual C++ generated include file.

 // Used by MPCTestAPI.rc

 //

-#define IDR_RT_MANIFEST                 1

 #define IDM_ABOUTBOX                    0x0010

 #define IDD_ABOUTBOX                    100

 #define IDS_ABOUTBOX                    101

diff --git a/src/apps/mplayerc/mplayerc.vcxproj b/src/apps/mplayerc/mplayerc.vcxproj
index b7c7af005..5a557e4b2 100644
--- a/src/apps/mplayerc/mplayerc.vcxproj
+++ b/src/apps/mplayerc/mplayerc.vcxproj
@@ -73,6 +73,10 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin10\mpc-hc_x64\</OutDir>

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

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

+    <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'">

     <PreBuildEvent>

@@ -97,9 +101,6 @@ update_version.bat
       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

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

     <PreBuildEvent>

@@ -125,9 +126,6 @@ update_version.bat
       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

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

     <PreBuildEvent>

@@ -151,9 +149,6 @@ update_version.bat
       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

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

     <PreBuildEvent>

@@ -177,9 +172,6 @@ update_version.bat
       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

   <ItemGroup>

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

diff --git a/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf b/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf
index d85a97eaa..ebd87f6d6 100644
--- a/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf
+++ b/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf
@@ -19,8 +19,7 @@
       />

     </dependentAssembly>

   </dependency>

-  <!-- Identify the application security requirements -->

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">

+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

     <security>

       <requestedPrivileges>

         <requestedExecutionLevel

@@ -32,15 +31,13 @@
   </trustInfo>

   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">

     <application>

-      <!--The ID below indicates application support for Windows Vista -->

       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>

-      <!--The ID below indicates application support for Windows 7 -->

       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>

     </application>

   </compatibility>

   <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">

     <asmv3:windowsSettings

-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

+        xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

       <dpiAware>true</dpiAware>

     </asmv3:windowsSettings>

   </asmv3:application>

diff --git a/src/apps/mplayerc/res/mpc-hc.exe.manifest.template b/src/apps/mplayerc/res/mpc-hc.exe.manifest.template
index 2b3116a33..d0a75f3f6 100644
--- a/src/apps/mplayerc/res/mpc-hc.exe.manifest.template
+++ b/src/apps/mplayerc/res/mpc-hc.exe.manifest.template
@@ -19,8 +19,7 @@
       />

     </dependentAssembly>

   </dependency>

-  <!-- Identify the application security requirements -->

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">

+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

     <security>

       <requestedPrivileges>

         <requestedExecutionLevel

@@ -32,15 +31,13 @@
   </trustInfo>

   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">

     <application>

-      <!--The ID below indicates application support for Windows Vista -->

       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>

-      <!--The ID below indicates application support for Windows 7 -->

       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>

     </application>

   </compatibility>

   <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">

     <asmv3:windowsSettings

-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

+        xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

       <dpiAware>true</dpiAware>

     </asmv3:windowsSettings>

   </asmv3:application>

diff --git a/src/apps/mplayerc/res/mplayerc.rc2 b/src/apps/mplayerc/res/mplayerc.rc2
index 3e9675afe..0aa0e511a 100644
--- a/src/apps/mplayerc/res/mplayerc.rc2
+++ b/src/apps/mplayerc/res/mplayerc.rc2
@@ -31,6 +31,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

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

 //

+// RT_MANIFEST

+//

+

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

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

 // FILE

 //

 

diff --git a/src/filters/transform/VSFilter/VSFilter.rc b/src/filters/transform/VSFilter/VSFilter.rc
index 28f82d3a7..b3c45200b 100644
--- a/src/filters/transform/VSFilter/VSFilter.rc
+++ b/src/filters/transform/VSFilter/VSFilter.rc
@@ -43,6 +43,14 @@ END
 

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

 //

+// RT_MANIFEST

+//

+

+2                       RT_MANIFEST             "res\\VSFilter.manifest"

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

 // Version

 //

 

diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj b/src/filters/transform/VSFilter/VSFilter.vcxproj
index 3e6b929ed..29bea3730 100644
--- a/src/filters/transform/VSFilter/VSFilter.vcxproj
+++ b/src/filters/transform/VSFilter/VSFilter.vcxproj
@@ -70,6 +70,10 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">$(SolutionDir)bin10\Filters_x64_Debug\</OutDir>

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

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">$(SolutionDir)bin10\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'">

     <PreBuildEvent>

@@ -93,9 +97,6 @@ update_version.bat
       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

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

     <PreBuildEvent>

@@ -120,9 +121,6 @@ update_version.bat
       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

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

     <PreBuildEvent>

@@ -146,9 +144,6 @@ update_version.bat
       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

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

     <PreBuildEvent>

@@ -172,9 +167,6 @@ update_version.bat
       <DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

-    <Manifest>

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

-    </Manifest>

   </ItemDefinitionGroup>

   <ItemGroup>

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

diff --git a/src/filters/transform/VSFilter/res/VSFilter.manifest b/src/filters/transform/VSFilter/res/VSFilter.manifest
index 663e648c8..28884e9c3 100644
--- a/src/filters/transform/VSFilter/res/VSFilter.manifest
+++ b/src/filters/transform/VSFilter/res/VSFilter.manifest
@@ -19,8 +19,7 @@
       />

     </dependentAssembly>

   </dependency>

-  <!-- Identify the application security requirements -->

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">

+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

     <security>

       <requestedPrivileges>

         <requestedExecutionLevel

@@ -32,15 +31,13 @@
   </trustInfo>

   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">

     <application>

-      <!--The ID below indicates application support for Windows Vista -->

       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>

-      <!--The ID below indicates application support for Windows 7 -->

       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>

     </application>

   </compatibility>

   <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">

     <asmv3:windowsSettings

-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

+        xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

       <dpiAware>true</dpiAware>

     </asmv3:windowsSettings>

   </asmv3:application>