summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2007-12-10 11:57:38 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2007-12-10 11:57:38 (GMT)
commitdc96a893397500b3a0ca97269c74728de9bf4cdd (patch)
tree8ba3ec94f9c9ef4951cd11ee0829fb2a81d5f8f6
parent9afd9ab6981c1b045a6bf4219b5523aca765f54a (diff)
downloadtk-dc96a893397500b3a0ca97269c74728de9bf4cdd.zip
tk-dc96a893397500b3a0ca97269c74728de9bf4cdd.tar.gz
tk-dc96a893397500b3a0ca97269c74728de9bf4cdd.tar.bz2
Handle MSVC 9 (aka: Visual Studio 2008)
-rw-r--r--ChangeLog2
-rw-r--r--win/rules.vc14
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f790333..dfa2961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-12-10 Pat Thoyts <patthoyts@users.sourceforge.net>
+ * win/rules.vc: Handle MSVC 9 (aka: Visual Studio 2008)
+
* tests/safe.test: Update for 'unload' as a safe command (tcl 8.5b3+)
2007-12-09 Donal K. Fellows <dkf@users.sf.net>
diff --git a/win/rules.vc b/win/rules.vc
index 836aaff..68ae0cf 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.19 2007/10/31 00:05:53 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.20 2007/12/10 11:57:38 patthoyts Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -189,10 +189,10 @@ VCVER=0
!if ![echo VCVERSION=_MSC_VER > vercl.x] \
&& ![cl -nologo -TC -P vercl.x $(ERRNULL)]
!include vercl.i
-!if $(VCVERSION) >= 1400
+!if $(VCVERSION) >= 1500
+VCVER=9
+!elseif $(VCVERSION) >= 1400
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 $(VCVERSION) >= 1300
VCVER=7
!elseif $(VCVERSION) >= 1200
@@ -200,6 +200,12 @@ VCVER=6
!endif
!endif
+# Since MSVC8 we must deal with manifest resources.
+!if $(VCVERSION) >= 1400
+_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
+!endif
+
#----------------------------------------------------------
# Decode the options requested.
#----------------------------------------------------------