1 files changed, 5 insertions, 8 deletions
diff --git a/src/YASM.bat b/src/YASM.bat
index dde5bc0a1..451fe036d 100755
--- a/src/YASM.bat
+++ b/src/YASM.bat
@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2012-2013 see Authors.txt
+REM (C) 2012-2013, 2015 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -17,12 +17,9 @@ REM You should have received a copy of the GNU General Public License
 REM along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-IF EXIST "%~dp0..\build.user.bat" (
-  CALL "%~dp0..\build.user.bat"
-) ELSE (
-  IF DEFINED MSYS SET MPCHC_MSYS=%MSYS%
-)
-
-SET PATH=%PATH%;%MPCHC_MSYS%\bin
+CALL "%~dp0..\common.bat" :SubSetPath
+IF %ERRORLEVEL% NEQ 0 EXIT /B 1
+CALL "%~dp0..\common.bat" :SubDoesExist yasm.exe
+IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 
 yasm.exe %*