diff options
| author | Thomas Heller <theller@ctypes.org> | 2010-05-04 19:17:41 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2010-05-04 19:17:41 (GMT) |
| commit | 667ce06de4e91d6e9b78d622303809b9f72c4012 (patch) | |
| tree | 4240dfae9da13123a74b7f24c31e0a3786a09980 /PCbuild | |
| parent | a9eb87a144988731b25923da1d531a572037f160 (diff) | |
| download | cpython-667ce06de4e91d6e9b78d622303809b9f72c4012.zip cpython-667ce06de4e91d6e9b78d622303809b9f72c4012.tar.gz cpython-667ce06de4e91d6e9b78d622303809b9f72c4012.tar.bz2 | |
Merged revisions 80761,80766 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80761 | thomas.heller | 2010-05-04 20:44:42 +0200 (Di, 04 Mai 2010) | 8 lines
On Windows, ctypes does no longer check the stack before and after
calling a foreign function. This allows to use the unmodified libffi
library.
Remove most files from _ctypes/libffi_msvc, only two include files
stay (updated from _ctypes/libffi/...). Other files are used in the
cross-platform _ctypes/libffi directory.
........
r80766 | thomas.heller | 2010-05-04 21:08:18 +0200 (Di, 04 Mai 2010) | 2 lines
Remove reference to unused source file.
........
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_ctypes.vcproj | 106 |
1 files changed, 79 insertions, 27 deletions
diff --git a/PCbuild/_ctypes.vcproj b/PCbuild/_ctypes.vcproj index b6abbe0..db5a85e 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,7 +42,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN32" /> <Tool Name="VCManagedResourceCompilerTool" @@ -103,7 +104,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN64" /> <Tool Name="VCManagedResourceCompilerTool" @@ -164,7 +166,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN32" /> <Tool Name="VCManagedResourceCompilerTool" @@ -228,7 +231,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN64" /> <Tool Name="VCManagedResourceCompilerTool" @@ -291,7 +295,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN32" /> <Tool Name="VCManagedResourceCompilerTool" @@ -355,7 +360,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN64" /> <Tool Name="VCManagedResourceCompilerTool" @@ -419,7 +425,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN32" /> <Tool Name="VCManagedResourceCompilerTool" @@ -483,7 +490,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc;..\Modules\_ctypes\libffi\include;..\Modules\_ctypes\libffi\src\x86" + PreprocessorDefinitions="X86_WIN64" /> <Tool Name="VCManagedResourceCompilerTool" @@ -543,7 +551,7 @@ > </File> <File - RelativePath="..\Modules\_ctypes\libffi_msvc\ffi_common.h" + RelativePath="..\Modules\_ctypes\libffi\include\ffi_common.h" > </File> <File @@ -551,7 +559,7 @@ > </File> <File - RelativePath="..\Modules\_ctypes\libffi_msvc\ffitarget.h" + RelativePath="..\Modules\_ctypes\libffi\src\x86\ffitarget.h" > </File> </Filter> @@ -575,15 +583,23 @@ > </File> <File - RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c" + RelativePath="..\Modules\_ctypes\libffi\src\x86\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_msvc\prep_cif.c" + RelativePath="..\Modules\_ctypes\libffi\src\prep_cif.c" > </File> <File @@ -591,14 +607,32 @@ > </File> <File - RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c" + RelativePath="..\Modules\_ctypes\libffi\src\x86\win32.S" > <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) > $(IntDir)$(InputName).asm
ml /nologo /Zi /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" > <Tool - Name="VCCLCompilerTool" + 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) > $(IntDir)$(InputName).asm
ml /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" /> </FileConfiguration> <FileConfiguration @@ -606,7 +640,16 @@ ExcludedFromBuild="true" > <Tool - Name="VCCLCompilerTool" + 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) > $(IntDir)$(InputName).asm
ml /nologo /Zi /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" /> </FileConfiguration> <FileConfiguration @@ -614,7 +657,16 @@ ExcludedFromBuild="true" > <Tool - Name="VCCLCompilerTool" + 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) > $(IntDir)$(InputName).asm
ml /nologo /Zi /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" /> </FileConfiguration> <FileConfiguration @@ -622,12 +674,12 @@ ExcludedFromBuild="true" > <Tool - Name="VCCLCompilerTool" + Name="VCCustomBuildTool" /> </FileConfiguration> </File> <File - RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm" + RelativePath="..\Modules\_ctypes\libffi\src\x86\win64.S" > <FileConfiguration Name="Debug|Win32" @@ -642,8 +694,8 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="ml64 /nologo /c /Zi /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" - Outputs="$(IntDir)\win64.obj" + CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) > $(IntDir)$(InputName).asm
ml64 /Zi /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" /> </FileConfiguration> <FileConfiguration @@ -659,8 +711,8 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" - Outputs="$(IntDir)\win64.obj" + CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) > $(IntDir)$(InputName).asm
ml64 /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" /> </FileConfiguration> <FileConfiguration @@ -676,8 +728,8 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" - Outputs="$(IntDir)\win64.obj" + CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) > $(IntDir)$(InputName).asm
ml64 /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" /> </FileConfiguration> <FileConfiguration @@ -693,8 +745,8 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" - Outputs="$(IntDir)\win64.obj" + CommandLine="cl /nologo /EP /I ..\Modules\_ctypes\libffi_msvc /I ..\Modules\_ctypes\libffi\src\x86 $(InputPath) > $(IntDir)$(InputName).asm
ml64 /nologo /c /Fo $(IntDir)$(InputName).obj $(IntDir)$(InputName).asm
" + Outputs="$(IntDir)$(InputName).obj" /> </FileConfiguration> </File> |