Re: [AD] Patch for makefile issue when compiling MSVC with Cygwin

[Michal Molhanec <michal@xxxxxxxxxx>]

Fix.bat simplification. It will now also convert paths for ICL target.

--
Regards,
    Michal

ICQ# 175762750

--- fix.bat.old	Sat Dec 30 12:57:34 2006
+++ fix.bat	Sat Dec 30 14:59:48 2006
@@ -111,6 +111,23 @@
 echo #define ALLEGRO_MSVC >> include\allegro\platform\alplatf.h
 if "%MSVCDir%" == "" set MSVCDir=%VCINSTALLDIR%
 if "%MSVCDir%" == "" echo Your MSVCDir environment variable is not set!
+
+REM msvc6 does not need this, msvc is fallback so we should do it anyway
+if [%1] == [msvc6]         goto skipconvert
+if [%2] == [--nomsvcpaths] goto skipconvert
+if [%3] == [--nomsvcpaths] goto skipconvert
+
+echo Converting MSVCDir path...
+cl /nologo /w misc/msvchelp.c >NUL
+msvchelp MSVCDir
+del msvchelp.exe
+del msvchelp.obj
+echo include makefile.helper >> makefile
+goto tail
+
+:skipconvert
+REM Don't put space before >> !
+echo MSVCDir = %MSVCDir%>> makefile
 goto tail
 
 :watcom
@@ -132,31 +149,7 @@
 echo.
 goto end
 
-:includemsvcdir
-if [%2] == [--nomsvcpaths] goto skipconvert
-if [%3] == [--nomsvcpaths] goto skipconvert
-echo Converting MSVCDir path...
-cl /nologo /w misc/msvchelp.c >NUL
-msvchelp MSVCDir
-del msvchelp.exe
-del msvchelp.obj
-echo include makefile.helper >> makefile
-goto realtail
-
-:skipconvert
-REM Don't put space before >> !
-echo MSVCDir = %MSVCDir%>> makefile
-goto realtail
-
 :tail
-
-REM msvc6 does not need this, msvc is fallback so we should do it anyway
-if [%1] == [msvc]    goto includemsvcdir
-if [%1] == [msvc6]   goto skipconvert
-if [%1] == [msvc7]   goto includemsvcdir
-if [%1] == [msvc8]   goto includemsvcdir
-
-:realtail
 rem Generate last line of makefile and optionally convert CR/LF.
 echo include makefile.all >> makefile