diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-12-10 18:32:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-12-10 18:32:53 (GMT) |
| commit | 81add12060f392c3972d930d0d63dc8eb3f61bf9 (patch) | |
| tree | 0a5e9b475197e01df5ade8e24af7e21dc3c36cee /win | |
| parent | ca999b7a3aa4dbfc85021901f0faa31dbed4cb1c (diff) | |
| download | tcl-81add12060f392c3972d930d0d63dc8eb3f61bf9.zip tcl-81add12060f392c3972d930d0d63dc8eb3f61bf9.tar.gz tcl-81add12060f392c3972d930d0d63dc8eb3f61bf9.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'win')
| -rw-r--r-- | win/rules.vc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/win/rules.vc b/win/rules.vc index 04a07a1..2c9ad20 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.29.2.3 2007/11/01 16:25:58 dgp Exp $ +# RCS: @(#) $Id: rules.vc,v 1.29.2.4 2007/12/10 18:33:38 dgp 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. #---------------------------------------------------------- |