--- a/vcmake.bat	Mon Jul 02 07:46:39 2018 +0200
+++ b/vcmake.bat	Mon Jul 02 07:46:41 2018 +0200
@@ -10,25 +10,39 @@
     popd
 )
 @SET DEFINES=
-@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
-@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
 make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
 
 
 
+@if not exist analyzer goto skip_stx_goodies_petitparser_analyzer
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/analyzer
+@echo "Building stx/goodies/petitparser/analyzer"
 @echo "***********************************"
-@cd analyzer
-@call vcmake %1 %2
-@cd ..
+@pushd analyzer
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+@goto done_stx_goodies_petitparser_analyzer
+:skip_stx_goodies_petitparser_analyzer
+@echo "###################################"
+@echo "FOLDER MISSING: stx/goodies/petitparser/analyzer"
+@echo "###################################"
+exit /b 1
+:done_stx_goodies_petitparser_analyzer
 
+@if not exist tests goto skip_stx_goodies_petitparser_tests
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/tests
+@echo "Building stx/goodies/petitparser/tests"
 @echo "***********************************"
-@cd tests
-@call vcmake %1 %2
-@cd ..
+@pushd tests
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+@goto done_stx_goodies_petitparser_tests
+:skip_stx_goodies_petitparser_tests
+@echo "###################################"
+@echo "FOLDER MISSING: stx/goodies/petitparser/tests"
+@echo "###################################"
+exit /b 1
+:done_stx_goodies_petitparser_tests