diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2005-11-03 00:17:30 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2005-11-03 00:17:30 (GMT) |
| commit | 2ac3a08a98a293de62ed6ae01aa7a7d139660207 (patch) | |
| tree | 86fab92b7dc7b1f3c9f8d9b9a0ead95a215fd1cd /win/rules.vc | |
| parent | 4299352915cf05025553108f48b7bf58f48a8353 (diff) | |
| download | tcl-2ac3a08a98a293de62ed6ae01aa7a7d139660207.zip tcl-2ac3a08a98a293de62ed6ae01aa7a7d139660207.tar.gz tcl-2ac3a08a98a293de62ed6ae01aa7a7d139660207.tar.bz2 | |
Applied patch #1096916 to support building with MSVC 8.
* generic/regerror.c: Avoid use of reserved word.
* generic/tcl.h: Select the right Tcl_Stat structure
* generic/tclDate.c: Casts to handle 64 bit time_t case.
* tests/env.test: Include essential envvar on Win32
* win/nmakehlp.c: Handle new return codes.
* win/makefile.vc: Use the selected options.
* win/rules.vc: Check options are applicable
* win/tclWinPort.h: Disable deprecated function warnings
* win/tclWinSock.c: Provide default value to avoid warning.
* win/tclWinTime.c: Add casts to handle 64bit time_t type.
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/win/rules.vc b/win/rules.vc index cfa4baa..6c595bc 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -10,7 +10,7 @@ # Copyright (c) 2001-2003 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.21 2005/08/11 22:06:47 kennykb Exp $ +# RCS: @(#) $Id: rules.vc,v 1.22 2005/11/03 00:17:31 patthoyts Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -64,7 +64,7 @@ RMDIR = deltree /Y #---------------------------------------------------------- !if !exist(nmakehlp.exe) -!if [$(cc32) -nologo -ML nmakehlp.c -link -subsystem:console > nul] +!if [$(cc32) -nologo nmakehlp.c -link -subsystem:console > nul] !endif !endif @@ -73,7 +73,7 @@ RMDIR = deltree /Y #---------------------------------------------------------- ### test for optimizations -!if [nmakehlp -c -Otip] +!if [nmakehlp -c -Oti] !message *** Compiler has 'Optimizations' OPTIMIZING = 1 !else @@ -81,6 +81,32 @@ OPTIMIZING = 1 OPTIMIZING = 0 !endif +OPTIMIZATIONS = + +!if [nmakehlp -c -Op] +OPTIMIZATIONS = $(OPTIMIZATIONS) -Op +!endif + +!if [nmakehlp -c -fp:strict] +OPTIMIZATIONS = $(OPTIMIZATIONS) -fp:strict +!endif + +!if [nmakehlp -c -Gs] +OPTIMIZATIONS = $(OPTIMIZATIONS) -Gs +!endif + +!if [nmakehlp -c -GS] +OPTIMIZATIONS = $(OPTIMIZATIONS) -GS +!endif + +DEBUGFLAGS = + +!if [nmakehlp -c -RTC1] +DEBUGFLAGS = $(DEBUGFLAGS) -RTC1 +!elseif [nmakehlp -c -GZ] +DEBUGFLAGS = $(DEBUGFLAGS) -GZ +!endif + !if "$(MACHINE)" == "IX86" ### test for pentium errata !if [nmakehlp -c -QI0f] |