mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 12:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Allows nasm to be found on the system-wide path before using the version in externals.

Browse source
This commit is contained in:
Steve Dower 2014-12-12 17:15:18 -08:00
parent f4f1080e2e
commit c4c79a0e82
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PCbuild/openssl.props
View file

@ -52,13 +52,15 @@
<Target Name="FindNasm"> <Target Name="FindNasm">
<PropertyGroup> <PropertyGroup>
<nasm Condition="$(Platform) == 'Win32'">"$(nasmDir)nasm.exe" -f win32</nasm> <nasm Condition="$(Platform) == 'Win32'">nasm.exe -f win32</nasm>
<nasm Condition="$(Platform) == 'x64'">"$(nasmDir)nasm.exe" -f win64 -DNEAR -Ox -g</nasm> <nasm Condition="$(Platform) == 'x64'">nasm.exe -f win64 -DNEAR -Ox -g</nasm>
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<Target Name="BuildNasmFiles" BeforeTargets="PreBuildEvent" DependsOnTargets="PrepareForBuild;FindNasm" Inputs="@(NasmCompile)" Outputs="@(NasmCompile->'$(IntDir)%(Filename).obj')"> <Target Name="BuildNasmFiles" BeforeTargets="PreBuildEvent" DependsOnTargets="PrepareForBuild;FindNasm" Inputs="@(NasmCompile)" Outputs="@(NasmCompile->'$(IntDir)%(Filename).obj')">
<Exec Command='$(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' /> <Exec Command='setlocal
set PATH=%PATH%;$(nasmDir)
$(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
<ItemGroup> <ItemGroup>
<Link Include="$(IntDir)%(NasmCompile.Filename).obj" /> <Link Include="$(IntDir)%(NasmCompile.Filename).obj" />
<Lib Include="$(IntDir)%(NasmCompile.Filename).obj" /> <Lib Include="$(IntDir)%(NasmCompile.Filename).obj" />