- cleanup manifest handling

This commit is contained in:
Rainer Kottenhoff 2017-08-10 10:25:33 +02:00
parent aee59ebf60
commit 8bdad106c4
4 changed files with 30 additions and 4 deletions

View File

@ -101,6 +101,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -123,6 +124,9 @@
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName />
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -147,6 +151,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -169,12 +174,16 @@
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName />
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Link>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<ClCompile>
</ClCompile>
@ -194,12 +203,16 @@
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName />
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<ClCompile>
</ClCompile>
@ -218,6 +231,9 @@
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName />
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\Dialogs.c" />

View File

@ -6,4 +6,5 @@
version="1.0.2.138"
type="win32"
/>
<description>metapath</description>
</assembly>

View File

@ -6,4 +6,5 @@
version="2.0.2.411"
type="win32"
/>
<description>Notepad3</description>
</assembly>

View File

@ -114,6 +114,7 @@
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(IntermediateOutputPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<PreBuildEvent>
<Command>..\Version.exe</Command>
@ -136,7 +137,8 @@
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
<ResourceOutputFileName>
</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -159,6 +161,7 @@
<TargetMachine>MachineX64</TargetMachine>
<AdditionalLibraryDirectories>$(IntermediateOutputPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<PreBuildEvent>
<Command>
@ -183,7 +186,8 @@
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
<ResourceOutputFileName>
</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -208,6 +212,7 @@
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(IntermediateOutputPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<PreBuildEvent>
<Command>..\Version.exe</Command>
@ -230,7 +235,8 @@
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
<ResourceOutputFileName>
</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -254,6 +260,7 @@
<TargetMachine>MachineX64</TargetMachine>
<AdditionalLibraryDirectories>$(IntermediateOutputPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<ManifestFile />
</Link>
<PreBuildEvent>
<Command>
@ -278,7 +285,8 @@
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
<ResourceOutputFileName>
</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>