diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-17 15:03:42 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-17 15:03:42 (GMT) |
| commit | 78f62882e23aacc0a133fd786ab338dab74f52aa (patch) | |
| tree | 709de19e1422be87777185c53596320c09636f4d /win | |
| parent | 71e4e517adef8fec361cf29fe0267b8969397c5d (diff) | |
| download | tcl-78f62882e23aacc0a133fd786ab338dab74f52aa.zip tcl-78f62882e23aacc0a133fd786ab338dab74f52aa.tar.gz tcl-78f62882e23aacc0a133fd786ab338dab74f52aa.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 8 | ||||
| -rw-r--r-- | win/tcl.dsp | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index d22aee1..447ad0e 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.160.2.3 2007/09/14 16:28:39 dgp Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.160.2.4 2007/09/17 15:03:48 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -422,11 +422,11 @@ cdebug = -O2 $(OPTIMIZATIONS) !else cdebug = !endif -!else if "$(MACHINE)" == "IA64" +!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64" ### Warnings are too many, can't support warnings into errors. -cdebug = -Z7 -Od $(DEBUGFLAGS) +cdebug = -Zi -Od $(DEBUGFLAGS) !else -cdebug = -Z7 -WX $(DEBUGFLAGS) +cdebug = -Zi -WX $(DEBUGFLAGS) !endif ### Declarations common to all compiler options diff --git a/win/tcl.dsp b/win/tcl.dsp index 193ef14..7f9f06c 100644 --- a/win/tcl.dsp +++ b/win/tcl.dsp @@ -43,9 +43,9 @@ CFG=tcl - Win32 Debug Static # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release\tcl_Dynamic" -# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=none MSVCDIR=IDE" -# PROP Rebuild_Opt "-a" -# PROP Target_File "Release\tclsh85.exe" +# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads MSVCDIR=IDE" +# PROP Rebuild_Opt "clean release" +# PROP Target_File "Release\tclsh85t.exe" # PROP Bsc_Name "" # PROP Target_Dir "" @@ -64,9 +64,9 @@ CFG=tcl - Win32 Debug Static # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug\tcl_Dynamic" -# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols MSVCDIR=IDE" -# PROP Rebuild_Opt "-a" -# PROP Target_File "Debug\tclsh85g.exe" +# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads,symbols MSVCDIR=IDE" +# PROP Rebuild_Opt "clean release" +# PROP Target_File "Debug\tclsh85tg.exe" # PROP Bsc_Name "" # PROP Target_Dir "" |