From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 6 Nov 2008 16:43:00 +0000 (+0000)
Subject: Issue #4120: Exclude manifest from extension modules in VS2008.
X-Git-Tag: v2.7a1~2680
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=692c2f8fe6c62142a7c7e014537d2994acf07b73;p=thirdparty%2FPython%2Fcpython.git

Issue #4120: Exclude manifest from extension modules in VS2008.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index a430b83dfabc..0b6a9d580d80 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,6 +57,8 @@ Library
 Build
 -----
 
+- Issue #4120: Exclude manifest from extension modules in VS2008.
+
 - Issue #4091: Install pythonxy.dll in system32 again.
 
 - Issue #4018: Disable "for me" installations on Vista.
diff --git a/PCbuild/pyd.vsprops b/PCbuild/pyd.vsprops
index 726cebd1b008..ee79e7f1fb09 100644
--- a/PCbuild/pyd.vsprops
+++ b/PCbuild/pyd.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -15,6 +15,11 @@
 		OutputFile="$(OutDir)\$(ProjectName).pyd"
 		ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 		ImportLibrary="$(OutDir)\$(TargetName).lib"
+		GenerateManifest="false"
+	/>
+	<Tool
+		Name="VCManifestTool"
+		EmbedManifest="false"
 	/>
 	<Tool
 		Name="VCPostBuildEventTool"
diff --git a/PCbuild/pyd_d.vsprops b/PCbuild/pyd_d.vsprops
index f838b67d8ad0..850815631488 100644
--- a/PCbuild/pyd_d.vsprops
+++ b/PCbuild/pyd_d.vsprops
@@ -19,6 +19,11 @@
 		LinkIncremental="1"
 		ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
 		ImportLibrary="$(OutDir)\$(TargetName).lib"
+		GenerateManifest="false"
+	/>
+	<Tool
+		Name="VCManifestTool"
+		EmbedManifest="false"
 	/>
 	<Tool
 		Name="VCPostBuildEventTool"