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.
........
This commit is contained in:
Martin v. Löwis 2008-11-06 17:29:54 +00:00
parent 39811fdabd
commit e55ab5e625
3 changed files with 13 additions and 1 deletions

View File

@ -55,6 +55,8 @@ Library
Build Build
----- -----
- Issue #4120: Exclude manifest from extension modules in VS2008.
- Issue #4091: Install pythonxy.dll in system32 again. - Issue #4091: Install pythonxy.dll in system32 again.
- Issue #4018: Disable "for me" installations on Vista. - Issue #4018: Disable "for me" installations on Vista.

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet <VisualStudioPropertySheet
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
@ -15,6 +15,11 @@
OutputFile="$(OutDir)\$(ProjectName).pyd" OutputFile="$(OutDir)\$(ProjectName).pyd"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
ImportLibrary="$(OutDir)\$(TargetName).lib" ImportLibrary="$(OutDir)\$(TargetName).lib"
GenerateManifest="false"
/>
<Tool
Name="VCManifestTool"
EmbedManifest="false"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"

View File

@ -19,6 +19,11 @@
LinkIncremental="1" LinkIncremental="1"
ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb" ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
ImportLibrary="$(OutDir)\$(TargetName).lib" ImportLibrary="$(OutDir)\$(TargetName).lib"
GenerateManifest="false"
/>
<Tool
Name="VCManifestTool"
EmbedManifest="false"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"