summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-11-06 17:30:03 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-11-06 17:30:03 (GMT)
commit900646ef682ff8aaffca0c2294ed9416d5a1947c (patch)
treed672cab00c75a03cd7153d3776e962111175a182 /PCbuild
parent10f3710244ecab48ad03085bb707109fca524c2b (diff)
downloadcpython-900646ef682ff8aaffca0c2294ed9416d5a1947c.zip
cpython-900646ef682ff8aaffca0c2294ed9416d5a1947c.tar.gz
cpython-900646ef682ff8aaffca0c2294ed9416d5a1947c.tar.bz2
Merged revisions 67120 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67120 | martin.v.loewis | 2008-11-06 17:43:00 +0100 (Do, 06 Nov 2008) | 2 lines Issue #4120: Exclude manifest from extension modules in VS2008. ........
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/pyd.vsprops7
-rw-r--r--PCbuild/pyd_d.vsprops5
2 files changed, 11 insertions, 1 deletions
diff --git a/PCbuild/pyd.vsprops b/PCbuild/pyd.vsprops
index 726cebd..ee79e7f 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 f838b67..8508156 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"