From ee611ca51da2e317967a332d75ff75bfdb87db96 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans@noemail.net>
Date: Sat, 23 Oct 2010 21:43:04 +0000
Subject: Update for VS10
FossilOrigin-Name: 16f33d699c9568346d83eac2cab3049fe653985f
---
ChangeLog | 6 +++++-
win/rules.vc | 19 +++++++++++++------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 234f267..f1485b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-23 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/rules.vc Update for VS10
+
2010-03-12 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkButton.h [Bug 2956548] TkpButtonSetDefaults only
@@ -3699,7 +3703,7 @@
[Merge from HEAD]
Mac OS X: Fix several problems with Icelandic (and Faroese) keyboards
- reported by J�r�me Gagnon-Voyer <gagnonje5000<at>mac<dot>com> on
+ reported by J�r�me Gagnon-Voyer <gagnonje5000<at>mac<dot>com> on
tcl-mac on 2004-03-22.
* macosx/tkMacOSXKeyEvent.c (KLSInit): Add.
diff --git a/win/rules.vc b/win/rules.vc
index 678f4b3..ba87724 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
# Copyright (c) 2003-2006 Patrick Thoyts
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.5.2.9 2007/09/11 00:13:12 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.5.2.10 2010/10/23 21:43:05 nijtmans Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -83,7 +83,7 @@ COPY = copy /y >NUL
!message *** Compiler has 'Optimizations'
OPTIMIZING = 1
!else
-!message *** Compiler doesn't have 'Optimizations'
+!message *** Compiler does not have 'Optimizations'
OPTIMIZING = 0
!endif
@@ -145,9 +145,9 @@ 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 doesn't have 'Pentium 0x0f fix'
+!message *** Compiler does not have 'Pentium 0x0f fix'
!endif
!endif
@@ -167,7 +167,7 @@ COMPILERFLAGS = $(COMPILERFLAGS) -QIA64_Bx
!message *** Linker has 'Win98 alignment problem'
ALIGN98_HACK = 1
!else
-!message *** Linker doesn't have 'Win98 alignment problem'
+!message *** Linker does not have 'Win98 alignment problem'
ALIGN98_HACK = 0
!endif
!else
@@ -195,6 +195,14 @@ VCVER=7
VCVER=8
_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1
_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
+!elseif ![cl /Zs /Tc NUL 2>&1 | find "Version 15" > NUL]
+VCVER=9
+_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
+!elseif ![cl /Zs /Tc NUL 2>&1 | find "Version 16" > NUL]
+VCVER=10
+_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
!else
VCVER=0
!endif
@@ -393,7 +401,6 @@ FULLWARNINGS = 0
!endif
!endif
-
#----------------------------------------------------------
# Set our defines now armed with our options.
#----------------------------------------------------------
--
cgit v0.12