diff options
| author | davygrvy <davygrvy> | 2003-08-25 20:35:59 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2003-08-25 20:35:59 (GMT) |
| commit | 0b27dea6c1d325d960e37f1bf4c6d33dfa2e8257 (patch) | |
| tree | aa988b0ac20ab17e2b6e2167a9eee3141954aca3 | |
| parent | 7176fbfe8f030ba7fdd274ee9c6a945c1a0c0ebc (diff) | |
| download | tk-0b27dea6c1d325d960e37f1bf4c6d33dfa2e8257.zip tk-0b27dea6c1d325d960e37f1bf4c6d33dfa2e8257.tar.gz tk-0b27dea6c1d325d960e37f1bf4c6d33dfa2e8257.tar.bz2 | |
Don't do a string compare on the $(DBGX) variable, use the $(DEBUG)
boolean directly. Also, don't try to regen the stubs table if $(TCLSH) doesn't
exist.
| -rw-r--r-- | win/makefile.vc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index c14b5b5..c8927e8 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.71 2003/05/13 14:15:08 vincentdarley Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.72 2003/08/25 20:35:59 davygrvy Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -373,16 +373,16 @@ cflags = $(cflags) -QIA64_Bx !endif !if $(MSVCRT) -!if "$(DBGX)" == "" -crt = -MD -!else +!if $(DEBUG) crt = -MDd -!endif !else -!if "$(DBGX)" == "" -crt = -MT +crt = -MD +!endif !else +!if $(DEBUG) crt = -MTd +!else +crt = -MT !endif !endif @@ -555,8 +555,12 @@ install-libraries: #--------------------------------------------------------------------- genstubs: +!if !exist($(TCLSH)) + @echo Build tclsh first! +!else $(TCLSH) $(_TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \ $(GENERICDIR)\$(PROJECT).decls $(GENERICDIR)\$(PROJECT)Int.decls +!endif #--------------------------------------------------------------------- |