Add AMD64 and Itanium configurationgs to ctypes;

disable them in the solution since ctypes doesn't
support these processors on Windows.

diff --git a/PCbuild/_ctypes.vcproj b/PCbuild/_ctypes.vcproj
index b8212c55fdd1230bc6fddb492f299b2c2d4b2870..f303c21287964e8d34a9b4ea9edf491fb4219dd5 100644 (file)
--- a/PCbuild/_ctypes.vcproj
+++ b/PCbuild/_ctypes.vcproj
@@ -116,6 +116,122 @@
                        <Tool
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                </Configuration>
+               <Configuration
+                       Name="ReleaseAMD64|Win32"
+                       OutputDirectory="."
+                       IntermediateDirectory="amd64-temp-release\_ctypes"
+                       ConfigurationType="2"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /USECL:MS_OPTERON"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+                               StringPooling="TRUE"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="2"
+                               BufferSecurityCheck="FALSE"
+                               EnableFunctionLevelLinking="TRUE"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
+                               OutputFile="./_ctypes.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               GenerateDebugInformation="FALSE"
+                               ProgramDatabaseFile=".\./_ctypes.pdb"
+                               SubSystem="0"
+                               OptimizeReferences="0"
+                               EnableCOMDATFolding="0"
+                               ImportLibrary=".\./_ctypes.lib"
+                               TargetMachine="0"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+               <Configuration
+                       Name="ReleaseItanium|Win32"
+                       OutputDirectory="."
+                       IntermediateDirectory="ia64-temp-release\_ctypes"
+                       ConfigurationType="2"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+                               StringPooling="TRUE"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="2"
+                               BufferSecurityCheck="FALSE"
+                               EnableFunctionLevelLinking="TRUE"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
+                               OutputFile="./_ctypes.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               GenerateDebugInformation="FALSE"
+                               ProgramDatabaseFile=".\./_ctypes.pdb"
+                               SubSystem="0"
+                               OptimizeReferences="0"
+                               EnableCOMDATFolding="0"
+                               ImportLibrary=".\./_ctypes.lib"
+                               TargetMachine="0"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
        </Configurations>
        <References>
        </References>

diff --git a/PCbuild/_ctypes_test.vcproj b/PCbuild/_ctypes_test.vcproj
index b92f8182a5720fc57fd13855918a54ebcf5e0ef3..9467b14714a0b6d374e675ad449ac00419a686a0 100644 (file)
--- a/PCbuild/_ctypes_test.vcproj
+++ b/PCbuild/_ctypes_test.vcproj
@@ -116,6 +116,119 @@
                        <Tool
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                </Configuration>
+               <Configuration
+                       Name="ReleaseItanium|Win32"
+                       OutputDirectory="."
+                       IntermediateDirectory="ia64-temp-release\_ctypes_test"
+                       ConfigurationType="2"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+                               MinimalRebuild="FALSE"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               BufferSecurityCheck="FALSE"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
+                               OutputFile="./_ctypes_test_d.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               GenerateDebugInformation="TRUE"
+                               ProgramDatabaseFile=".\./_ctypes_test_d.pdb"
+                               SubSystem="0"
+                               ImportLibrary=".\./_ctypes_test_d.lib"
+                               TargetMachine="0"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+               <Configuration
+                       Name="ReleaseAMD64|Win32"
+                       OutputDirectory="."
+                       IntermediateDirectory="amd64-temp-release\_ctypes_test"
+                       ConfigurationType="2"
+                       CharacterSet="2">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /USECL:MS_OPTERON"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+                               StringPooling="TRUE"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="2"
+                               BufferSecurityCheck="FALSE"
+                               EnableFunctionLevelLinking="TRUE"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
+                               OutputFile="./_ctypes_test.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               GenerateDebugInformation="FALSE"
+                               ProgramDatabaseFile=".\./_ctypes_test.pdb"
+                               SubSystem="0"
+                               OptimizeReferences="0"
+                               EnableCOMDATFolding="0"
+                               ImportLibrary=".\./_ctypes_test.lib"
+                               TargetMachine="0"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
        </Configurations>
        <References>
        </References>

diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 47c3bcead65bd3623d33b3aba4bbc57d6b7d6ed2..88d8c45d869e3f5802eadf533fd6a4be94d05716 100644 (file)
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -252,18 +252,14 @@ Global
                {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug.Build.0 = Debug|Win32
                {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.ActiveCfg = Release|Win32
                {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.Build.0 = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.ActiveCfg = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.Build.0 = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseItanium.ActiveCfg = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseItanium.Build.0 = Release|Win32
+               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32
+               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
                {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.ActiveCfg = Debug|Win32
                {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.Build.0 = Debug|Win32
                {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.ActiveCfg = Release|Win32
                {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.Build.0 = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.ActiveCfg = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.Build.0 = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium.ActiveCfg = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium.Build.0 = Release|Win32
+               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32
+               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
        EndGlobalSection
        GlobalSection(SolutionItems) = postSolution
                ..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c