diff options
| author | escoffon <escoffon> | 1998-10-07 20:57:27 (GMT) |
|---|---|---|
| committer | escoffon <escoffon> | 1998-10-07 20:57:27 (GMT) |
| commit | 733f2ab4691d31c0fdca72da988c5f4878ee5709 (patch) | |
| tree | 1880d807836ac0b0e2b59ff98c08b49aa22c3191 | |
| parent | f6cc4da350c6d079be66b0a55b914e52ff720e7e (diff) | |
| download | tk-733f2ab4691d31c0fdca72da988c5f4878ee5709.zip tk-733f2ab4691d31c0fdca72da988c5f4878ee5709.tar.gz tk-733f2ab4691d31c0fdca72da988c5f4878ee5709.tar.bz2 | |
Fixed a bug that caused the Tk DLL to be linked against msvcrt.lib for
both debug and nodebug builds.
| -rw-r--r-- | win/makefile.vc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index bf7ac93..2c33ee1 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.15 1998/09/30 22:09:23 escoffon Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.16 1998/10/07 20:57:27 escoffon Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -229,11 +229,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 |