Re: [AD] /docs MSVC7 specific makefile target

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


Evert Glebbeek wrote:
MrPatch Applyer:   please use guilt's   fix.bat patch instead of mine.


It's not a diff. I'd need to check that it doesn't remove things from the
current CVS version if I overwrite it and if it does, I need to fix that
manually - and that's even without possible problems related to line
endings.
A diff I would apply, but a full file is more work for me. I'll see if I
have the time.


apologies, i am running 4 concurrent patch submissions in my head at moment. you are right it is not a diff.
i will make a diff for it.
hang on....

(minutes later)



here is the patch:




--- fix.bat	2005-02-05 06:05:00.000000000 +1100
+++ \fix.bat	2005-03-29 19:06:03.312500000 +1000
@@ -28,6 +28,7 @@
 if [%1] == [mingw32] goto head
 if [%1] == [msvc]    goto head
 if [%1] == [msvc7]   goto head
+if [%1] == [icl]     goto head
 if [%1] == [watcom]  goto head
 goto help

@@ -43,6 +44,7 @@
 if [%1] == [mingw32] goto mingw32
 if [%1] == [msvc]    goto msvc
 if [%1] == [msvc7]   goto msvc7
+if [%1] == [icl]     goto icl
 if [%1] == [watcom]  goto watcom

 echo fix.bat internal error: not reached
@@ -66,12 +68,21 @@
 echo #define ALLEGRO_MINGW32 >> include\allegro\platform\alplatf.h
 goto tail

+:icl
+echo Configuring Allegro for Windows/ICL...
+echo ALLEGRO_USE_ICL = 1 >> makefile
+goto msvccommon
+
 :msvc7
+echo Configuring Allegro for Windows/MSVC7...
 echo COMPILER_MSVC7 = 1 >> makefile
-goto msvc
+goto msvccommon

 :msvc
 echo Configuring Allegro for Windows/MSVC...
+goto msvccommon
+
+:msvccommon
 echo MAKEFILE_INC = makefile.vc >> makefile
 echo #define ALLEGRO_MSVC >> include\allegro\platform\alplatf.h
 goto tail
@@ -86,7 +97,7 @@
 echo.
 echo Usage: fix platform [--quick] [--msvcpaths]
 echo.
-echo Where platform is one of: bcc32, djgpp, mingw32, msvc, msvc7 or watcom. +echo Where platform is one of: bcc32, djgpp, mingw32, msvc, msvc7, icl or watcom.
 echo.
 echo The --quick parameter is used to turn off LF to CR/LF conversion.
 echo.
@@ -121,6 +132,7 @@
 if [%1] == [mingw32] goto done
 if [%1] == [msvc]    goto done
 if [%1] == [msvc7]   goto done
+if [%1] == [icl]     goto done

 echo Converting Allegro files to DOS CR/LF format...
 utod .../*.bat .../*.sh .../*.c *.cfg .../*.h .../*.inc .../*.rc




Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/