From 9b2ac7289f71df6ab7b0254ab55e55b203af3687 Mon Sep 17 00:00:00 2001 From: jasonmoxham Date: Fri, 1 Apr 2011 03:16:04 +0000 Subject: [PATCH] msvc cl build tweeks --- win/configure.bat | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/win/configure.bat b/win/configure.bat index bae3fba7..e5d10f3e 100644 --- a/win/configure.bat +++ b/win/configure.bat @@ -120,23 +120,24 @@ if not errorlevel 1 goto :gotyasm set YASMEXE=vsyasm.exe vsyasm.exe --version > nul 2>&1 if not errorlevel 1 goto :gotyasm -if not "%YASMPATH%" == "" ( - set PATH="%PATH%;%YASMPATH%" - yasm.exe --version > nul 2>&1 - if not errorlevel 1 (set YASMEXE=yasm.exe) +if exist "%YASMPATH%\yasm.exe" == "" ( + set YASMEXE="%YASMPATH%\yasm.exe" + goto :gotyasm +) +if exist "%YASMPATH%\vsyasm.exe" == "" ( + set YASMEXE="%YASMPATH%\vsyasm.exe" goto :gotyasm ) if exist "%VS100COMNTOOLS%\..\..\VC\bin\vsyasm.exe" ( - set PATH="%PATH%;%VS100COMNTOOLS%\..\..\VC\bin\" + set YASMEXE="%VS100COMNTOOLS%\..\..\VC\bin\vsyasm.exe" goto :gotyasm ) if exist "c:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations\vsyasm.exe" ( - set PATH="%PATH%;c:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations\" + set YASMEXE="c:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations\vsyasm.exe" goto :gotyasm ) -set YASMEXE=yasm.exe if exist "%VS90COMNTOOLS%\..\..\VC\bin\yasm.exe" ( - set PATH="%PATH%;%VS90COMNTOOLS%\..\..\VC\bin\" + set YASMEXE="%VS90COMNTOOLS%\..\..\VC\bin\yasm.exe" goto :gotyasm ) echo cant find yasm