summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2010-06-21 16:00:31 (GMT)
committerThomas Heller <theller@ctypes.org>2010-06-21 16:00:31 (GMT)
commitb00697e67c186cdcbc7fcb0f96d4d3304bdff7fa (patch)
tree7a3361c0a6d20910fb5f54feeba9ef816086e744 /PCbuild
parent31b16a51fd9d0a66ecae98ff9499019c106f6265 (diff)
downloadcpython-b00697e67c186cdcbc7fcb0f96d4d3304bdff7fa.zip
cpython-b00697e67c186cdcbc7fcb0f96d4d3304bdff7fa.tar.gz
cpython-b00697e67c186cdcbc7fcb0f96d4d3304bdff7fa.tar.bz2
Merged revisions 82126-82127 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r82126 | thomas.heller | 2010-06-21 16:00:24 +0200 (Mo, 21 Jun 2010) | 1 line Fix #8959 by reverting revision 80761. ........ r82127 | thomas.heller | 2010-06-21 17:01:18 +0200 (Mo, 21 Jun 2010) | 2 lines Add tests for problems reported in issue 8959. ........
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/_ctypes.vcproj106
1 files changed, 27 insertions, 79 deletions
diff --git a/PCbuild/_ctypes.vcproj b/PCbuild/_ctypes.vcproj
index db5a85e..b6abbe0 100644
--- a/PCbuild/_ctypes.vcproj
+++ b/PCbuild/_ctypes.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_ctypes"
ProjectGUID="{0E9791DB-593A-465F-98BC-681011311618}"
RootNamespace="_ctypes"
@@ -42,8 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN32"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -104,8 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN64"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -166,8 +164,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN32"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -231,8 +228,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN64"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -295,8 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN32"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -360,8 +355,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN64"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -425,8 +419,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN32"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -490,8 +483,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86"
- PreprocessorDefinitions="X86_WIN64"
+ AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -551,7 +543,7 @@
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi\include\ffi_common.h"
+ RelativePath="..\Modules\_ctypes\libffi_msvc\ffi_common.h"
>
</File>
<File
@@ -559,7 +551,7 @@
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi\src\x86\ffitarget.h"
+ RelativePath="..\Modules\_ctypes\libffi_msvc\ffitarget.h"
>
</File>
</Filter>
@@ -583,23 +575,15 @@
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi\src\x86\ffi.c"
+ RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c"
>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="X86_WIN64"
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_ctypes\malloc_closure.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi\src\prep_cif.c"
+ RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c"
>
</File>
<File
@@ -607,32 +591,14 @@
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi\src\x86\win32.S"
+ RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c"
>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml /nologo /Zi /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
+ Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
@@ -640,16 +606,7 @@
ExcludedFromBuild="true"
>
<Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="PGInstrument|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml /nologo /Zi /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
+ Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
@@ -657,16 +614,7 @@
ExcludedFromBuild="true"
>
<Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="PGUpdate|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml /nologo /Zi /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
+ Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
@@ -674,12 +622,12 @@
ExcludedFromBuild="true"
>
<Tool
- Name="VCCustomBuildTool"
+ Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi\src\x86\win64.S"
+ RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm"
>
<FileConfiguration
Name="Debug|Win32"
@@ -694,8 +642,8 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml64 /Zi /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
+ CommandLine="ml64 /nologo /c /Zi /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+ Outputs="$(IntDir)\win64.obj"
/>
</FileConfiguration>
<FileConfiguration
@@ -711,8 +659,8 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml64 /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
+ CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+ Outputs="$(IntDir)\win64.obj"
/>
</FileConfiguration>
<FileConfiguration
@@ -728,8 +676,8 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml64 /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
+ CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+ Outputs="$(IntDir)\win64.obj"
/>
</FileConfiguration>
<FileConfiguration
@@ -745,8 +693,8 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) &gt; $(IntDir)$(InputName).asm&#x0D;&#x0A;ml64 /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm&#x0D;&#x0A;"
- Outputs="$(IntDir)$(InputName).obj"
+ CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+ Outputs="$(IntDir)\win64.obj"
/>
</FileConfiguration>
</File>