Skip to content

Commit c4c79a0

Browse files
committed
Allows nasm to be found on the system-wide path before using the version in externals.
1 parent f4f1080 commit c4c79a0

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

PCbuild/openssl.props

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@
5252

5353
<Target Name="FindNasm">
5454
<PropertyGroup>
55-
<nasm Condition="$(Platform) == 'Win32'">"$(nasmDir)nasm.exe" -f win32</nasm>
56-
<nasm Condition="$(Platform) == 'x64'">"$(nasmDir)nasm.exe" -f win64 -DNEAR -Ox -g</nasm>
55+
<nasm Condition="$(Platform) == 'Win32'">nasm.exe -f win32</nasm>
56+
<nasm Condition="$(Platform) == 'x64'">nasm.exe -f win64 -DNEAR -Ox -g</nasm>
5757
</PropertyGroup>
5858
</Target>
5959

6060
<Target Name="BuildNasmFiles" BeforeTargets="PreBuildEvent" DependsOnTargets="PrepareForBuild;FindNasm" Inputs="@(NasmCompile)" Outputs="@(NasmCompile->'$(IntDir)%(Filename).obj')">
61-
<Exec Command='$(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
61+
<Exec Command='setlocal
62+
set PATH=%PATH%;$(nasmDir)
63+
$(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
6264
<ItemGroup>
6365
<Link Include="$(IntDir)%(NasmCompile.Filename).obj" />
6466
<Lib Include="$(IntDir)%(NasmCompile.Filename).obj" />

0 commit comments

Comments
 (0)