Skip to content

Commit 81df9dc

Browse files
committed
build, tools, win: update nasm detection
Logs the NASM path when it found.
1 parent faada65 commit 81df9dc

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

tools/msvs/find_nasm.cmd

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22

33
ECHO Looking for NASM
44

5-
FOR /F "delims=" %%a IN ('where nasm 2^> NUL') DO (
5+
FOR /B "delims=" %%a IN ('where nasm 2^> NUL') DO (
6+
ECHO NASM found in %%a
67
EXIT /B 0
78
)
89

9-
IF EXIST "%ProgramFiles%\NASM\nasm.exe" (
10-
SET "Path=%Path%;%ProgramFiles%\NASM"
11-
EXIT /B 0
10+
FOR %%a IN ("%ProgramFiles%\NASM\nasm.exe" "%ProgramFiles(x86)%\NASM\nasm.exe" "%LOCALAPPDATA%\bin\NASM\nasm.exe") DO (
11+
IF EXIST %%a (
12+
CALL :find-nasm %%a
13+
EXIT /B 0
14+
)
1215
)
13-
14-
IF EXIST "%ProgramFiles(x86)%\NASM\nasm.exe" (
15-
SET "Path=%Path%;%ProgramFiles(x86)%\NASM"
16-
EXIT /B 0
17-
)
18-
19-
if EXIST "%LOCALAPPDATA%\bin\NASM\nasm.exe" (
20-
SET "Path=%Path%;%LOCALAPPDATA%\bin\NASM"
21-
EXIT /B 0
22-
)
23-
2416
EXIT /B 1
17+
18+
:find-nasm
19+
SET p=%~1
20+
:: Remove the last nine characters, which are "\nasm.exe"
21+
SET p=%p:~0,-9%
22+
SET "Path=%Path%;%p%"
23+
SET p=
24+
ECHO NASM found in %~1
25+
EXIT /B 0

0 commit comments

Comments
 (0)