summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2007-01-19 09:00:29 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2007-01-19 09:00:29 (GMT)
commit107083d2827f3392406b7c771bffc20643b58524 (patch)
tree602865eff218f443473c6fe9250f74f2112c49dd
parentc539b8aef301a3fc08d0bf11e33985953a5118d6 (diff)
downloadtk-107083d2827f3392406b7c771bffc20643b58524.zip
tk-107083d2827f3392406b7c771bffc20643b58524.tar.gz
tk-107083d2827f3392406b7c771bffc20643b58524.tar.bz2
Build fix for man2tcl.c with MSVC8
-rw-r--r--ChangeLog6
-rw-r--r--win/makefile.vc6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 86893dc..c1c20b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2006-01-19 Daniel Steffen <das@users.sourceforge.net>
+2007-01-19 Joe Mistachkin <joe@mistachkin.com>
+
+ * win/makefile.vc: Properly build man2tcl.c for MSVC8.
+
+2007-01-19 Daniel Steffen <das@users.sourceforge.net>
* macosx/Wish.xcodeproj/project.pbxproj: remove libtommath defines.
diff --git a/win/makefile.vc b/win/makefile.vc
index 2cb4aad..5b33f4e 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.98 2006/11/03 11:22:22 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.99 2007/01/19 09:00:30 mistachkin Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -715,7 +715,9 @@ CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
$(MAN2TCL): $(TCLTOOLSDIR)\$$(@B).c
- $(cc32) -nologo -G4 -ML -O2 -Fo$(@D)\ $(TCLTOOLSDIR)\$(@B).c -link -out:$@
+ $(cc32) $(TK_CFLAGS) -Fo$(@D)\ $(TCLTOOLSDIR)\$(@B).c
+ $(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj
+ $(_VC_MANIFEST_EMBED_EXE)
$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)