summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavygrvy <davygrvy>2003-08-25 20:35:59 (GMT)
committerdavygrvy <davygrvy>2003-08-25 20:35:59 (GMT)
commit156d956258e0f1eb9c3df55199f3eafb3809505c (patch)
treeaa988b0ac20ab17e2b6e2167a9eee3141954aca3
parent2a9cac2f153a627049db0157027d41a94bb0f1b2 (diff)
downloadtk-156d956258e0f1eb9c3df55199f3eafb3809505c.zip
tk-156d956258e0f1eb9c3df55199f3eafb3809505c.tar.gz
tk-156d956258e0f1eb9c3df55199f3eafb3809505c.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.vc18
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
#---------------------------------------------------------------------