diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-07 21:25:05 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-07 21:25:05 +0400 |
commit | 96568c1c996f662c33d2c44b1884a874791e2488 (patch) | |
tree | 96e9bf7c16cbc97f6bd85370121c5af5d20fe12c /src/filters/transform | |
parent | 0d5de4c8e7b1f6d6247e1ec0f127a8c02312fc88 (diff) |
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
Diffstat (limited to 'src/filters/transform')
-rw-r--r-- | src/filters/transform/VSFilter/VSFilter.vcxproj | 19 | ||||
-rw-r--r-- | src/filters/transform/VSFilter/VSFilter.vcxproj.filters | 5 | ||||
-rw-r--r-- | src/filters/transform/VSFilter/res/VSFilter.rc2 | 7 |
3 files changed, 12 insertions, 19 deletions
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
//
|