diff options
| author | nijtmans <nijtmans@noemail.net> | 2010-10-23 21:29:54 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans@noemail.net> | 2010-10-23 21:29:54 (GMT) |
| commit | a5c043b4f2e88950ce4307b566327dd371adca88 (patch) | |
| tree | 5118e0afa62b91be1df908ccfea42700d2616ea1 /win/rules.vc | |
| parent | 7bedb27ae0029f017d8137c17211fa20376f33ce (diff) | |
| download | tk-a5c043b4f2e88950ce4307b566327dd371adca88.zip tk-a5c043b4f2e88950ce4307b566327dd371adca88.tar.gz tk-a5c043b4f2e88950ce4307b566327dd371adca88.tar.bz2 | |
Update for VS10
FossilOrigin-Name: e9950e27f6217e2973f7fcb56f3b8d31b9c9ddcc
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/win/rules.vc b/win/rules.vc index e0a7a5d..d40ddd3 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -11,7 +11,7 @@ # Copyright (c) 2003-2007 Patrick Thoyts # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.21.2.1 2009/10/15 21:07:49 patthoyts Exp $ +# RCS: @(#) $Id: rules.vc,v 1.21.2.2 2010/10/23 21:29:54 nijtmans Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -143,7 +143,7 @@ OPTIMIZATIONS = $(OPTIMIZATIONS) -YX ### test for pentium errata !if [nmakehlp -c -QI0f] !message *** Compiler has 'Pentium 0x0f fix' -COMPILERFLAGS = $(COMPILERFLAGSS) -QI0f +COMPILERFLAGS = $(COMPILERFLAGS) -QI0f !else !message *** Compiler does not have 'Pentium 0x0f fix' !endif @@ -189,7 +189,9 @@ VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i -!if $(VCVERSION) >= 1500 +!if $(VCVERSION) >= 1600 +VCVER=10 +!elseif $(VCVERSION) >= 1500 VCVER=9 !elseif $(VCVERSION) >= 1400 VCVER=8 @@ -549,8 +551,8 @@ TCLSH = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe" TCLSTUBLIB = "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib" TCLIMPLIB = "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib" TCL_LIBRARY = $(_TCLDIR)\lib -TCLREGLIB = "$(_TCLDIR)\lib\tclreg11$(SUFX:t=).lib" -TCLDDELIB = "$(_TCLDIR)\lib\tcldde12$(SUFX:t=).lib" +TCLREGLIB = "$(_TCLDIR)\lib\tclreg12$(SUFX:t=).lib" +TCLDDELIB = "$(_TCLDIR)\lib\tcldde13$(SUFX:t=).lib" COFFBASE = \must\have\tcl\sources\to\build\this\target TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target TCL_INCLUDES = -I"$(_TCLDIR)\include" |