diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj index ecc547c9ff4..fc3a5f913d6 100644 --- a/PCbuild/_bsddb.vcproj +++ b/PCbuild/_bsddb.vcproj @@ -145,6 +145,80 @@ + + + + + + + + + + + + + + + @@ -167,6 +241,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/> + + + diff --git a/PCbuild/_socket.vcproj b/PCbuild/_socket.vcproj index 6e7040330a2..46d303d787c 100644 --- a/PCbuild/_socket.vcproj +++ b/PCbuild/_socket.vcproj @@ -143,6 +143,79 @@ + + + + + + + + + + + + + + + @@ -165,6 +238,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/> + + + diff --git a/PCbuild/_ssl.vcproj b/PCbuild/_ssl.vcproj index 6096f4ff519..3bcd564c008 100644 --- a/PCbuild/_ssl.vcproj +++ b/PCbuild/_ssl.vcproj @@ -37,6 +37,19 @@ ReBuildCommandLine="python_d -u build_ssl.py -d -a" Output="_ssl_d.pyd"/> + + + diff --git a/PCbuild/_testcapi.vcproj b/PCbuild/_testcapi.vcproj index 7abd022a102..222fd7e3628 100644 --- a/PCbuild/_testcapi.vcproj +++ b/PCbuild/_testcapi.vcproj @@ -140,6 +140,77 @@ + + + + + + + + + + + + + + + @@ -163,6 +234,14 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)" BasicRuntimeChecks="3"/> + + + diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj index 3eb5a4dcbcb..a80c173b472 100644 --- a/PCbuild/_tkinter.vcproj +++ b/PCbuild/_tkinter.vcproj @@ -145,6 +145,80 @@ + + + + + + + + + + + + + + + @@ -167,6 +241,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/> + + + @@ -186,6 +268,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/> + + + diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj index 415f03abd6e..4e8ef9807e2 100644 --- a/PCbuild/bz2.vcproj +++ b/PCbuild/bz2.vcproj @@ -136,6 +136,83 @@ nmake /nologo /f makefile.msc Name="VCPreLinkEventTool" CommandLine="cd ..\..\bzip2-1.0.2 nmake /nologo /f makefile.msc lib +"/> + + + + + + + + + + + + + + + + + + diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 4132f708c16..c09256fd935 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -83,72 +83,104 @@ Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release + ReleaseItanium = ReleaseItanium EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Debug.ActiveCfg = Debug|Win32 {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Debug.Build.0 = Debug|Win32 {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Release.ActiveCfg = Release|Win32 {E1DBB220-D64B-423D-A545-539A55AA7FE2}.Release.Build.0 = Release|Win32 + {E1DBB220-D64B-423D-A545-539A55AA7FE2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {E1DBB220-D64B-423D-A545-539A55AA7FE2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Debug.ActiveCfg = Debug|Win32 {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Debug.Build.0 = Debug|Win32 {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Release.ActiveCfg = Release|Win32 {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Release.Build.0 = Release|Win32 + {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Debug.ActiveCfg = Debug|Win32 {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Debug.Build.0 = Debug|Win32 {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Release.ActiveCfg = Release|Win32 {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.Release.Build.0 = Release|Win32 + {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {59CBF474-9E06-4C50-9142-C44A118BB447}.Debug.ActiveCfg = Debug|Win32 {59CBF474-9E06-4C50-9142-C44A118BB447}.Debug.Build.0 = Debug|Win32 {59CBF474-9E06-4C50-9142-C44A118BB447}.Release.ActiveCfg = Release|Win32 {59CBF474-9E06-4C50-9142-C44A118BB447}.Release.Build.0 = Release|Win32 + {59CBF474-9E06-4C50-9142-C44A118BB447}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {59CBF474-9E06-4C50-9142-C44A118BB447}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Debug.ActiveCfg = Debug|Win32 {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Debug.Build.0 = Debug|Win32 {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Release.ActiveCfg = Release|Win32 {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.Release.Build.0 = Release|Win32 + {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {5B51DFF7-5DC0-41F8-8791-A4AB7114A151}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {AC557788-6354-43F7-BE05-C9C8C59A344A}.Debug.ActiveCfg = Debug|Win32 {AC557788-6354-43F7-BE05-C9C8C59A344A}.Debug.Build.0 = Debug|Win32 {AC557788-6354-43F7-BE05-C9C8C59A344A}.Release.ActiveCfg = Release|Win32 {AC557788-6354-43F7-BE05-C9C8C59A344A}.Release.Build.0 = Release|Win32 + {AC557788-6354-43F7-BE05-C9C8C59A344A}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {AC557788-6354-43F7-BE05-C9C8C59A344A}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug.ActiveCfg = Debug|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug.Build.0 = Debug|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release.ActiveCfg = Release|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium.Build.0 = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug.ActiveCfg = Debug|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug.Build.0 = Debug|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release.ActiveCfg = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release.Build.0 = Release|Win32 + {7E551393-3C43-47F8-9F3F-5BC368A6C487}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {7E551393-3C43-47F8-9F3F-5BC368A6C487}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug.ActiveCfg = Debug|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug.Build.0 = Debug|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release.ActiveCfg = Release|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release.Build.0 = Release|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug.ActiveCfg = Debug|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug.Build.0 = Debug|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release.ActiveCfg = Release|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release.Build.0 = Release|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug.ActiveCfg = Debug|Win32 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug.Build.0 = Debug|Win32 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release.ActiveCfg = Release|Win32 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release.Build.0 = Release|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug.ActiveCfg = Debug|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug.Build.0 = Debug|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release.ActiveCfg = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release.Build.0 = Release|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug.ActiveCfg = Debug|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug.Build.0 = Debug|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release.ActiveCfg = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release.Build.0 = Release|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug.ActiveCfg = Debug|Win32 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug.Build.0 = Debug|Win32 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release.ActiveCfg = Release|Win32 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release.Build.0 = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.ReleaseItanium.ActiveCfg = Release|Win32 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug.ActiveCfg = Debug|Win32 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug.Build.0 = Debug|Win32 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release.ActiveCfg = Release|Win32 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release.Build.0 = Release|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.ActiveCfg = Debug|Win32 {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.Build.0 = Debug|Win32 {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.ActiveCfg = Release|Win32 {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32 + {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = Release|Win32 + {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionItems) = postSolution readme.txt = readme.txt diff --git a/PCbuild/pyexpat.vcproj b/PCbuild/pyexpat.vcproj index 7f3f24a93a4..3bbb8910ba2 100644 --- a/PCbuild/pyexpat.vcproj +++ b/PCbuild/pyexpat.vcproj @@ -143,6 +143,79 @@ + + + + + + + + + + + + + + + @@ -165,6 +238,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/> + + + @@ -184,6 +265,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/> + + + @@ -203,6 +292,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/> + + + @@ -222,6 +319,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/> + + + diff --git a/PCbuild/python.vcproj b/PCbuild/python.vcproj index a48dd8be59e..7d13c435517 100644 --- a/PCbuild/python.vcproj +++ b/PCbuild/python.vcproj @@ -137,6 +137,75 @@ + + + + + + + + + + + + + + + @@ -163,6 +232,14 @@ PreprocessorDefinitions="" BrowseInformation="1"/> + + + @@ -180,6 +257,13 @@ PreprocessorDefinitions="" AdditionalIncludeDirectories="\Pyinst\python\PC"/> + + + diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index 2710d375381..a74a5b723e2 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -147,6 +147,80 @@ + + + + + + + + + + + + + + + @@ -193,6 +267,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -218,6 +300,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -237,6 +327,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -256,6 +354,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -278,6 +384,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -300,6 +414,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -319,6 +441,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -338,6 +468,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -357,6 +495,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -376,6 +522,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -395,6 +549,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -414,6 +576,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -433,6 +603,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -452,6 +630,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -471,6 +657,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -490,6 +684,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -509,6 +711,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -528,6 +738,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -547,6 +765,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -566,6 +792,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -588,6 +822,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -607,6 +849,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -626,6 +876,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -645,6 +903,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -664,6 +930,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -686,6 +960,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -705,6 +987,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -724,6 +1014,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -743,6 +1041,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -762,6 +1068,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -781,6 +1095,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -800,6 +1122,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -819,6 +1149,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -838,6 +1176,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -857,6 +1203,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -876,6 +1230,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -895,6 +1257,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -914,6 +1284,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -933,6 +1311,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -952,6 +1338,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -974,6 +1368,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -993,6 +1395,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="BUILD=54"/> + + + @@ -1012,6 +1422,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1031,6 +1449,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1050,6 +1476,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1069,6 +1503,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1088,6 +1530,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1107,6 +1557,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1126,6 +1584,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1145,6 +1611,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1164,6 +1638,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1183,6 +1665,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1202,6 +1692,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1221,6 +1719,14 @@ AdditionalIncludeDirectories="..\Python" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1240,6 +1746,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1259,6 +1773,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1278,6 +1800,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1297,6 +1827,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1316,6 +1854,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1335,6 +1881,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1354,6 +1908,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1373,6 +1935,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1392,6 +1962,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1411,6 +1989,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1430,6 +2016,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1449,6 +2043,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1468,6 +2070,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1487,6 +2097,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1509,6 +2127,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1528,6 +2154,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1547,6 +2181,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1569,6 +2211,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1588,6 +2238,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1607,6 +2265,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1626,6 +2292,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1645,6 +2319,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1664,6 +2346,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1683,6 +2373,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1702,6 +2400,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1724,6 +2430,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1743,6 +2457,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1762,6 +2484,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1781,6 +2511,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1801,6 +2539,13 @@ PreprocessorDefinitions="" AdditionalIncludeDirectories="\Pyinst\python\PC"/> + + + @@ -1820,6 +2565,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1839,6 +2592,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1858,6 +2619,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1877,6 +2646,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1896,6 +2673,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1915,6 +2700,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1934,6 +2727,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1953,6 +2754,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1972,6 +2781,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -1991,6 +2808,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2010,6 +2835,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2029,6 +2862,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2048,6 +2889,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2067,6 +2916,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2086,6 +2943,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2105,6 +2970,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2127,6 +3000,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2146,6 +3027,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2165,6 +3054,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2184,6 +3081,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2203,6 +3108,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2222,6 +3135,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2241,6 +3162,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2260,6 +3189,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2279,6 +3216,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2298,6 +3243,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2317,6 +3270,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2336,6 +3297,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2355,6 +3324,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2374,6 +3351,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + @@ -2393,6 +3378,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + + + diff --git a/PCbuild/pythonw.vcproj b/PCbuild/pythonw.vcproj index 843b74dbaeb..0eab69062df 100644 --- a/PCbuild/pythonw.vcproj +++ b/PCbuild/pythonw.vcproj @@ -139,6 +139,77 @@ + + + + + + + + + + + + + + + @@ -159,6 +230,13 @@ PreprocessorDefinitions="" AdditionalIncludeDirectories="\Pyinst\python\PC"/> + + + @@ -178,6 +256,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions=""/> + + + diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index f8257e394de..80e573389e7 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -287,6 +287,21 @@ _ssl build_ssl.py/MSVC isn't clever enough to clean OpenSSL - you must do this by hand. +Building for Itanium +-------------------- + +The project files support a ReleaseItanium configuration which creates +Win64/Itanium binaries. For this to work, you need to install the Platform +SDK, in particular the 64-bit support. This includes an Itanium compiler +(future releases of the SDK likely include an AMD64 compiler as well). +In addition, you need the Visual Studio plugin for external C compilers, +from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to +locate the proper target compiler, and convert compiler options +accordingly. + +The Itanium build has seen little testing. The SDK compiler reports a lot +of warnings about conversion from size_t to int, which will be fixed in +future Python releases. YOUR OWN EXTENSION DLLs ----------------------- diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj index 1406da1c0f1..188a2986a33 100644 --- a/PCbuild/select.vcproj +++ b/PCbuild/select.vcproj @@ -145,6 +145,80 @@ + + + + + + + + + + + + + + + @@ -167,6 +241,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;$(NoInherit)"/> + + + diff --git a/PCbuild/unicodedata.vcproj b/PCbuild/unicodedata.vcproj index 3d56e5e2b36..16bb4aa74d7 100644 --- a/PCbuild/unicodedata.vcproj +++ b/PCbuild/unicodedata.vcproj @@ -140,6 +140,77 @@ + + + + + + + + + + + + + + + @@ -163,6 +234,14 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)" BasicRuntimeChecks="3"/> + + + diff --git a/PCbuild/winsound.vcproj b/PCbuild/winsound.vcproj index b456b1d173f..f3790d877ec 100644 --- a/PCbuild/winsound.vcproj +++ b/PCbuild/winsound.vcproj @@ -142,6 +142,78 @@ + + + + + + + + + + + + + + + @@ -165,6 +237,14 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;WINSOUND_EXPORTS;$(NoInherit)"/> + + + diff --git a/PCbuild/zlib.vcproj b/PCbuild/zlib.vcproj index b505d8424e3..4ad457cb074 100644 --- a/PCbuild/zlib.vcproj +++ b/PCbuild/zlib.vcproj @@ -138,6 +138,84 @@ nmake -nologo -f win32\Makefile.msc zlib.lib Description="Checking static zlib has been built" CommandLine="cd ..\..\zlib-1.2.1 nmake -nologo -f win32\Makefile.msc zlib.lib +"/> + + + + + + + + + + + + + + +