summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorescoffon <escoffon@noemail.net>1998-10-07 20:57:09 (GMT)
committerescoffon <escoffon@noemail.net>1998-10-07 20:57:09 (GMT)
commitb26da50c3bd52e31ce8372c1b21d54085ccb7ad2 (patch)
tree3334340ec33912af11d37715f9790911322b7d9a
parent991598b9bf3533e69011d4fe2d6591678a861934 (diff)
downloadtcl-b26da50c3bd52e31ce8372c1b21d54085ccb7ad2.zip
tcl-b26da50c3bd52e31ce8372c1b21d54085ccb7ad2.tar.gz
tcl-b26da50c3bd52e31ce8372c1b21d54085ccb7ad2.tar.bz2
Fixed a bug that caused the Tcl DLL to be linked against msvcrt.lib for
both debug and nodebug builds. FossilOrigin-Name: 39335e2e3dc0a33b433270095eeaa9f25a3fa2cf
-rw-r--r--win/makefile.vc10
1 files changed, 5 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 8039860..0408234 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -4,7 +4,7 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# RCS: @(#) $Id: makefile.vc,v 1.17 1998/10/05 22:32:12 escoffon Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.18 1998/10/07 20:57:09 escoffon Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -216,11 +216,11 @@ guilflags = $(lflags) -subsystem:windows -entry:WinMainCRTStartup
dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
!IF "$(MACHINE)" == "PPC"
-libc = libc.lib
-libcdll = crtdll.lib
+libc = libc$(DBGX).lib
+libcdll = crtdll$(DBGX).lib
!ELSE
-libc = libc.lib oldnames.lib
-libcdll = msvcrt.lib oldnames.lib
+libc = libc$(DBGX).lib oldnames.lib
+libcdll = msvcrt$(DBGX).lib oldnames.lib
!ENDIF
baselibs = kernel32.lib $(optlibs) advapi32.lib user32.lib