diff options
| author |   Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 17:30:03 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 17:30:03 +0000 |
| commit | 900646ef682ff8aaffca0c2294ed9416d5a1947c (patch) | |
| tree | d672cab00c75a03cd7153d3776e962111175a182 | |
| parent | Tagging release. (diff) | |
| download | cpython-900646ef682ff8aaffca0c2294ed9416d5a1947c.tar.gz cpython-900646ef682ff8aaffca0c2294ed9416d5a1947c.tar.bz2 cpython-900646ef682ff8aaffca0c2294ed9416d5a1947c.zip | |
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.
........
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/pyd.vsprops | 7 | ||||
| -rw-r--r-- | PCbuild/pyd_d.vsprops | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS index 0a218a980ba..16aa8a4fc67 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,6 +103,8 @@ Extension Modules 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 726cebd1b00..ee79e7f1fb0 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 f838b67d8ad..85081563148 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" |