diff options
| author | davygrvy <davygrvy@pobox.com> | 2001-09-15 14:09:51 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@pobox.com> | 2001-09-15 14:09:51 (GMT) |
| commit | 821ece32ce969d844d686950dd8d42a99c8920af (patch) | |
| tree | 1c6822e5194d800c29e6ea0cd73a839c71ddc2f9 | |
| parent | 070ad1e328c369a946e461f74687d0ce59b81609 (diff) | |
| download | tcl-821ece32ce969d844d686950dd8d42a99c8920af.zip tcl-821ece32ce969d844d686950dd8d42a99c8920af.tar.gz tcl-821ece32ce969d844d686950dd8d42a99c8920af.tar.bz2 | |
environment prob repaired by using recursion. Looks scary, but works.
| -rw-r--r-- | win/makefile.win | 5 | ||||
| -rw-r--r-- | win/mkvc32.mif | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/win/makefile.win b/win/makefile.win index cb601ae..57a0f93 100644 --- a/win/makefile.win +++ b/win/makefile.win @@ -9,7 +9,7 @@ # Tool specific syntax is NOT allowed in this file. # #============================================================================== -# RCS: @(#) $Id: makefile.win,v 1.1.2.4 2001/09/11 03:52:13 davygrvy Exp $ +# RCS: @(#) $Id: makefile.win,v 1.1.2.5 2001/09/15 14:09:51 davygrvy Exp $ #============================================================================== ### Remove all '!' for MinGW.. Sorry, could find another way to do this. @@ -46,6 +46,8 @@ !endif !endif +!ifndef BAILOUT + #============================================== # Targets. #============================================== @@ -91,3 +93,4 @@ cvsupdate : $(SYM) cd .. set CVS_RSH=$(CVS_RSH) $(CVSCMD) update $(CVS_OPTS) +!endif
\ No newline at end of file diff --git a/win/mkvc32.mif b/win/mkvc32.mif index 52f0a7b..e0d7784 100644 --- a/win/mkvc32.mif +++ b/win/mkvc32.mif @@ -6,7 +6,7 @@ # NMAKE specific syntax is allowed in this file. # #============================================================================== -# RCS: @(#) $Id: mkvc32.mif,v 1.1.2.3 2001/09/15 01:56:54 davygrvy Exp $ +# RCS: @(#) $Id: mkvc32.mif,v 1.1.2.4 2001/09/15 14:09:51 davygrvy Exp $ #============================================================================== !ifndef _MKVC32_MIF @@ -35,8 +35,8 @@ TOOLSET = vc32 MAKECMD = nmake.exe -nologo /$(MAKEFLAGS) -f makefile.vc32 SYM = -rc32 = rc -cc32 = cl +rc32 = $(RC) +cc32 = $(CC) link32 = link lib32 = lib cvtres32 = cvtres @@ -63,12 +63,15 @@ vcvars = "$(TOOLSETvc32)\vc98\bin\vcvars32.bat" !message +++ Microsoft Visual C++ tools are NOT in the path and !message +++ $(vcvars) will be used. -!if [ $(vcvars) ] != 0 + +### We now need to recurse back into ourseLves, then baiL. +!if [ $(vcvars) & nmake -nologo /$(MAKEFLAGS) -f makefile.win ] != 0 !endif +BAILOUT = 1 + !else -!message +++ Microsoft Visual C++ tools are in the path. -!endif +#!message +++ Microsoft Visual C++ tools are in the path. #============================================== @@ -136,7 +139,6 @@ _NMAKE_VER = $(_NMAKE_VER:6.00.8168.0=600) # $(ObjDir)\*.dll \ # $(ObjDir)\*.map \ # $(ObjDir)\*.res \ -# $(ObjDir)\*.rc \ # $(ObjDir)\*.bin \ # $(ObjDir)\*.lst \ # $(ObjDir)\*.blt \ @@ -155,7 +157,6 @@ _NMAKE_VER = $(_NMAKE_VER:6.00.8168.0=600) # erase $(ObjDir)\*.dll >NUL # erase $(ObjDir)\*.map >NUL # erase $(ObjDir)\*.res >NUL -# erase $(ObjDir)\*.rc >NUL # erase $(ObjDir)\*.bin >NUL # erase $(ObjDir)\*.lst >NUL # erase $(ObjDir)\*.blt >NUL @@ -164,4 +165,5 @@ _NMAKE_VER = $(_NMAKE_VER:6.00.8168.0=600) # erase $(ObjDir)\*.exp >NUL #!endif # OS == Windows_NT +!endif !endif # _MKVC32_MIF
\ No newline at end of file |