diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-05 22:02:31 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-05 22:02:31 (GMT) |
| commit | 786720876c4a473284a0324c8e3b43ed87e8f42c (patch) | |
| tree | 5507e5203ecc5ced16c06173b4cf13ab3c5fb012 /PCbuild9/python.vcproj | |
| parent | b9eccbfe2a90c6e37d0e1c767985933ea79026f8 (diff) | |
| download | cpython-786720876c4a473284a0324c8e3b43ed87e8f42c.zip cpython-786720876c4a473284a0324c8e3b43ed87e8f42c.tar.gz cpython-786720876c4a473284a0324c8e3b43ed87e8f42c.tar.bz2 | |
Merged revisions 59371-59375 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59374 | georg.brandl | 2007-12-05 22:52:40 +0100 (Wed, 05 Dec 2007) | 2 lines
Add Ross Light, a GHOP student, to ACKs.
........
r59375 | christian.heimes | 2007-12-05 22:57:25 +0100 (Wed, 05 Dec 2007) | 2 lines
The macros _WIN32, _WIN64 and _M_X64 are defined by the compiler. The VS 2008 IDE doesn't know about (some) of the macros and can display wrong information. In my case a section #ifdef _WIN64 was grayed out although the platform was x64. I've added the macros to pyproject.vsprops and x64.vsprops.
I've also added a paragraph about the property files to the readme and fixed the order of pyupdate > pyinstrument.
........
Diffstat (limited to 'PCbuild9/python.vcproj')
| -rw-r--r-- | PCbuild9/python.vcproj | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild9/python.vcproj b/PCbuild9/python.vcproj index 7efa98d..17b29a2 100644 --- a/PCbuild9/python.vcproj +++ b/PCbuild9/python.vcproj @@ -318,7 +318,7 @@ <Configuration Name="PGInstrument|Win32" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -392,7 +392,7 @@ <Configuration Name="PGInstrument|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -468,7 +468,7 @@ <Configuration Name="PGUpdate|Win32" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -542,7 +542,7 @@ <Configuration Name="PGUpdate|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" |