summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2007-01-19 08:45:57 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2007-01-19 08:45:57 (GMT)
commit04752af27c73732b84dc81b8f2284d5ca83e3962 (patch)
tree3daa4307b1f19ac1b0ecb6732c906723a991832d
parentea90619addc53b48a04c8596d172f074dc7527cb (diff)
downloadtcl-04752af27c73732b84dc81b8f2284d5ca83e3962.zip
tcl-04752af27c73732b84dc81b8f2284d5ca83e3962.tar.gz
tcl-04752af27c73732b84dc81b8f2284d5ca83e3962.tar.bz2
Build fix for man2tcl.c with MSVC8
-rw-r--r--ChangeLog1
-rw-r--r--win/makefile.vc6
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e546dbc..dd5e1a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* tools/man2tcl.c: Include stdlib.h for exit() and improve comment
detection.
* win/nmakehlp.c: Update usage.
+ * win/makefile.vc: Properly build man2tcl.c for MSVC8.
2007-01-19 Daniel Steffen <das@users.sourceforge.net>
diff --git a/win/makefile.vc b/win/makefile.vc
index b2173f2..04ef0ad 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.158 2007/01/11 13:17:09 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.159 2007/01/19 08:45:57 mistachkin Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -720,7 +720,9 @@ CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
@$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
$(MAN2TCL): $(TOOLSDIR)\$$(@B).c
- $(cc32) -nologo -G4 -ML -O2 -Fo$(@D)\ $(TOOLSDIR)\$(@B).c -link -out:$@
+ $(cc32) $(TCL_CFLAGS) -Fo$(@D)\ $(TOOLSDIR)\$(@B).c
+ $(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj
+ $(_VC_MANIFEST_EMBED_EXE)
$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\*
$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)