summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-13 21:52:01 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-13 21:52:01 +0000
commit782e55572581e53ee81866a0f0a7617414199825 (patch)
tree87c23e2f7eb4109dd751331a3691944cf89bb552
parentf61b22955265adc1e030310d04dfcfeaafcc13c7 (diff)
manifest suppression removed from .app properties
git-svn-id: http://svn.miranda-ng.org/main/trunk@14152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--build/vc.common/common.props22
-rw-r--r--build/vc.common/lib.props2
-rw-r--r--build/vc.common/plugin.props2
3 files changed, 4 insertions, 22 deletions
diff --git a/build/vc.common/common.props b/build/vc.common/common.props
index 25e2275815..4348ad800b 100644
--- a/build/vc.common/common.props
+++ b/build/vc.common/common.props
@@ -1,25 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ImportGroup Label="PropertySheets">
- </ImportGroup>
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
<PropertyGroup Label="UserMacros">
<CommonLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\bin10\lib</CommonLibDir>
<CommonLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\bin12\lib</CommonLibDir>
@@ -34,8 +14,6 @@
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <GenerateManifest>false</GenerateManifest>
- <EmbedManifest>false</EmbedManifest>
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
<LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
</PropertyGroup>
diff --git a/build/vc.common/lib.props b/build/vc.common/lib.props
index d3a645be8d..463e44bc21 100644
--- a/build/vc.common/lib.props
+++ b/build/vc.common/lib.props
@@ -21,6 +21,8 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
+ <GenerateManifest>false</GenerateManifest>
+ <EmbedManifest>false</EmbedManifest>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Libs\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Libs\</OutDir>
diff --git a/build/vc.common/plugin.props b/build/vc.common/plugin.props
index 9b99710d5c..ef1ed31add 100644
--- a/build/vc.common/plugin.props
+++ b/build/vc.common/plugin.props
@@ -21,6 +21,8 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
+ <GenerateManifest>false</GenerateManifest>
+ <EmbedManifest>false</EmbedManifest>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>