Update edksetup.bat to check NASM system environment variable

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index e065b6470a2b988d587b021e87524ad86cd9b738..f066d869e1e3f8e146dc8e64a554e50c638da84d 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -125,6 +125,7 @@ if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%
 IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools\r
 call %EDK_TOOLS_PATH%\toolsetup.bat %*\r
 if /I "%1"=="Reconfig" shift\r
+goto check_NASM\r
 goto check_cygwin\r
 \r
 :BadBaseTools\r
@@ -141,6 +142,15 @@ goto check_cygwin
   @echo.\r
   goto end\r
 \r
+:check_NASM\r
+if not defined NASM_PREFIX (\r
+    @echo.\r
+    @echo !!! WARNING !!! NASM_PREFIX environment variable is not set\r
+    @if exist "C:\nasm\nasm.exe" @set "NASM_PREFIX=C:\nasm\"\r
+    @if exist "C:\nasm\nasm.exe" @echo   Found nasm.exe, setting the environment variable to C:\nasm\\r
+    @if not exist "C:\nasm\nasm.exe" echo   Attempting to build modules that require NASM will fail.\r
+)\r
+\r
 :check_cygwin\r
 if defined CYGWIN_HOME (\r
   if not exist "%CYGWIN_HOME%" (\r