From 265f57a4ead2af98032cc3760d884a86ee1ab584 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Sat, 23 Oct 2010 21:28:36 +0000 Subject: Update for VS10 --- ChangeLog | 1 + win/rules.vc | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04e5b34..e71b7a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * generic/tclUniData.c: (re-generated) * generic/regc_locale.c:(re-generated) * generic/regcomp.c: fix comment + * win/rules.vc Update for VS10 2010-10-09 Miguel Sofer diff --git a/win/rules.vc b/win/rules.vc index 1eebd83..3abd4ff 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.35.2.1 2008/06/25 10:57:54 patthoyts Exp $ +# RCS: @(#) $Id: rules.vc,v 1.35.2.2 2010/10/23 21:28:36 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 -- cgit v0.12