diff options
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_ctypes.vcproj | 38 | ||||
| -rw-r--r-- | PCbuild/amd64_ml64.bat | 17 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 9 |
3 files changed, 57 insertions, 7 deletions
diff --git a/PCbuild/_ctypes.vcproj b/PCbuild/_ctypes.vcproj index a77fdd4bed..748ee44f7f 100644 --- a/PCbuild/_ctypes.vcproj +++ b/PCbuild/_ctypes.vcproj @@ -4,6 +4,7 @@ Version="7.10" Name="_ctypes" ProjectGUID="{F22F40F4-D318-40DC-96B3-88DC81CE0894}" + RootNamespace="_ctypes" Keyword="Win32Proj"> <Platforms> <Platform @@ -128,7 +129,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" + AdditionalOptions=" /USECL:MS_OPTERON /GS-" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" @@ -268,6 +269,41 @@ </File> <File RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c"> + <FileConfiguration + Name="ReleaseAMD64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + </File> + <File + RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm"> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + <FileConfiguration + Name="ReleaseAMD64|Win32"> + <Tool + Name="VCCustomBuildTool" + CommandLine="amd64_ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)" +" + Outputs=""$(IntDir)\win64.obj""/> + </FileConfiguration> + <FileConfiguration + Name="ReleaseItanium|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> </File> </Files> <Globals> diff --git a/PCbuild/amd64_ml64.bat b/PCbuild/amd64_ml64.bat new file mode 100644 index 0000000000..fa9acf12dd --- /dev/null +++ b/PCbuild/amd64_ml64.bat @@ -0,0 +1,17 @@ +@echo off +rem Try to find the AMD64 assembler and call it with the supplied arguments. + +set MLEXE=Microsoft Platform SDK\Bin\Win64\x86\AMD64\ml64.EXE + +rem For the environment variables see also +rem http://msdn.microsoft.com/library/en-us/win64/win64/wow64_implementation_details.asp + +if exist "%ProgramFiles%\%MLEXE%" ( + set ML64="%ProgramFiles%\%MLEXE%" +) else if exist "%ProgramW6432%\%MLEXE%" ( + set ML64="%ProgramW6432%\%MLEXE%" +) else ( + set ML64=ml64.exe +) + +%ML64% %* diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index f0f71b8ab1..ebaa78f7cf 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -683,6 +683,9 @@ RelativePath="..\Parser\parsetok.c"> </File> <File + RelativePath="..\Python\peephole.c"> + </File> + <File RelativePath="..\Modules\posixmodule.c"> </File> <File @@ -725,18 +728,12 @@ RelativePath="..\Modules\sha512module.c"> </File> <File - RelativePath="..\Modules\sha512module.c"> - </File> - <File RelativePath="..\Modules\shamodule.c"> </File> <File RelativePath="..\Modules\signalmodule.c"> </File> <File - RelativePath="..\Modules\signalmodule.c"> - </File> - <File RelativePath="..\Objects\sliceobject.c"> </File> <File |