diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 17:29:54 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 17:29:54 (GMT) |
| commit | e55ab5e625c3ac05c389603e59cb837f75f6cd8f (patch) | |
| tree | 3ac76098599e37efe6127ce610507e9ce78bfeb2 | |
| parent | 39811fdabd42556a7555bb944a566e43e82116d5 (diff) | |
| download | cpython-e55ab5e625c3ac05c389603e59cb837f75f6cd8f.zip cpython-e55ab5e625c3ac05c389603e59cb837f75f6cd8f.tar.gz cpython-e55ab5e625c3ac05c389603e59cb837f75f6cd8f.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.
........
| -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
@@ -55,6 +55,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 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" |