Fix building _ctypes.pyd for x64 / Windows.

diff --git a/PCbuild8/_ctypes/_ctypes.vcproj b/PCbuild8/_ctypes/_ctypes.vcproj
index 36877edf97e99e48d16be45e4b630806112e52ad..dfd3a58e8a924905b9416638a03a78945c7408bb 100644 (file)
--- a/PCbuild8/_ctypes/_ctypes.vcproj
+++ b/PCbuild8/_ctypes/_ctypes.vcproj
@@ -16,6 +16,9 @@
                />\r
        </Platforms>\r
        <ToolFiles>\r
+               <DefaultToolFile\r
+                       FileName="masm.rules"\r
+               />\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
@@ -30,6 +33,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -62,6 +68,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
@@ -104,6 +111,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -137,6 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="17"\r
@@ -179,6 +190,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -208,6 +222,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -253,6 +268,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -283,6 +301,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -328,6 +347,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -357,6 +379,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -402,6 +425,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -432,6 +458,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -477,6 +504,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -506,6 +536,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -551,6 +582,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -581,6 +615,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -721,6 +756,110 @@
                        <File\r
                                RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"\r
                                >\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64.exe /Zi /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"\r
+                                               Outputs="$(OutDir)/win64.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64.exe /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"\r
+                                               Outputs="$(OutDir)/win64.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64.exe /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"\r
+                                               Outputs="$(OutDir)/win64.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64.exe /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"\r
+                                               Outputs="$(OutDir)/win64.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                </Filter>\r
                <Filter\r