summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 44e4876..ccdf6c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11 Kevin Kenny <kennykb@users.sourceforge.net>
+
+ * win/makefile.vc: Added two missing uses of $(DBGX) so that
+ tclpip8x.dll loads without panicking on Win9x.
+
2003-03-09 Kevin Kenny <kennykb@users.sourceforge.net>
* generic/tclTest.c (TestChannelCmd): Removed an unused local
diff --git a/win/makefile.vc b/win/makefile.vc
index 39f0354..62196bb 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.101 2003/03/04 23:46:26 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.102 2003/03/11 21:59:52 kennykb Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -176,7 +176,7 @@ TCLSTUBLIB = $(OUT_DIR)\$(TCLSTUBLIBNAME)
TCLSHNAME = $(PROJECT)sh$(VERSION)$(SUFX).exe
TCLSH = $(OUT_DIR)\$(TCLSHNAME)
-TCLPIPEDLLNAME = $(PROJECT)pip$(VERSION).dll
+TCLPIPEDLLNAME = $(PROJECT)pip$(VERSION)$(SUFX:t=).dll
TCLPIPEDLL = $(OUT_DIR)\$(TCLPIPEDLLNAME)
TCLREGLIBNAME = $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
@@ -355,7 +355,7 @@ crt = -MTd
!endif
TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)"
-BASE_CLFAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES)
+BASE_CLFAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) -DTCL_DBGX=$(DBGX)
CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE
TCL_CFLAGS = $(BASE_CLFAGS) $(OPTDEFINES)