This is the third of three problems I encountered building tcl/tk 8.6.2b with kitgen 273ad4c... on Windows 7, using Visual Studio 2010.

Code in each of the 'rules.vc' files attempts to determine the compiler version in use and set VCVER accordingly. That version number is later used to name certain library files (e.g. mk4vc<n>.lib).

Several of the rules.vc files use an if/then/elseif chain to map the compiler's internal version number (VCVERSION) to VCVER, but at least one of those fails to map VC9 and above correctly and others fail to map VC10 correctly.

Others of the rules.vc files use an arithmetic expression to map VCVERSION to VCVER. That expression works correctly for all VC versions through 2010 (the newest I had available) and would presumably work correctly for newer versions as well.

The following patch changes each of the rules.vc files to use the arithmetic expression method of mapping VCVERSION to VCVER.

Subject: [PATCH] fixes for building on Windows with VC10

8.x/itcl/win/rules.vc | 13 +++++-------- 8.x/mk/win/rules.vc | 15 +++++++++------ 8.x/thread/win/vc/nmakehlp.exe | Bin 65536 -> 65536 bytes 8.x/thread/win/vc/rules.vc | 13 +++++-------- 8.x/vqtcl/win/rules.vc | 13 +++++-------- Makefile.vc | 17 +++++++---------- 6 files changed, 31 insertions(+), 40 deletions(-) mode change 100644 => 100755 8.x/thread/win/vc/nmakehlp.exe

diff --git a/8.x/itcl/win/rules.vc b/8.x/itcl/win/rules.vc index 4039582..506d990 100644 --- a/8.x/itcl/win/rules.vc +++ b/8.x/itcl/win/rules.vc @@ -192,14 +192,11 @@ VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i -!if $(VCVERSION) >= 1500 -VCVER=9 -!elseif $(VCVERSION) >= 1400 -VCVER=8 -!elseif $(VCVERSION) >= 1300 -VCVER=7 -!elseif $(VCVERSION) >= 1200 -VCVER=6 +!if ![echo VCVER= ^\> vercl.vc] \ + && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] +!include vercl.vc +!endif +!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] !endif !endif

diff --git a/8.x/mk/win/rules.vc b/8.x/mk/win/rules.vc index d5f839c..737695a 100644 --- a/8.x/mk/win/rules.vc +++ b/8.x/mk/win/rules.vc @@ -184,15 +184,18 @@ VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i +!if ![echo VCVER= ^\> vercl.vc] \ + && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] +!include vercl.vc +!endif +!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] +!endif +!endif + +# Since MSVC8 we must deal with manifest resources. !if $(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 -VCVER=6 -!endif !endif

#---------------------------------------------------------- diff --git a/8.x/thread/win/vc/nmakehlp.exe b/8.x/thread/win/vc/nmakehlp.exe old mode 100644 new mode 100755 diff --git a/8.x/thread/win/vc/rules.vc b/8.x/thread/win/vc/rules.vc index b94575a..6630600 100644 --- a/8.x/thread/win/vc/rules.vc +++ b/8.x/thread/win/vc/rules.vc @@ -192,14 +192,11 @@ VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i -!if $(VCVERSION) >= 1500 -VCVER=9 -!elseif $(VCVERSION) >= 1400 -VCVER=8 -!elseif $(VCVERSION) >= 1300 -VCVER=7 -!elseif $(VCVERSION) >= 1200 -VCVER=6 +!if ![echo VCVER= ^\> vercl.vc] \ + && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] +!include vercl.vc +!endif +!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] !endif !endif

diff --git a/8.x/vqtcl/win/rules.vc b/8.x/vqtcl/win/rules.vc index 0b78bc8..345bb6f 100644 --- a/8.x/vqtcl/win/rules.vc +++ b/8.x/vqtcl/win/rules.vc @@ -192,14 +192,11 @@ VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i -!if $(VCVERSION) >= 1500 -VCVER=9 -!elseif $(VCVERSION) >= 1400 -VCVER=8 -!elseif $(VCVERSION) >= 1300 -VCVER=7 -!elseif $(VCVERSION) >= 1200 -VCVER=6 +!if ![echo VCVER= ^\> vercl.vc] \ + && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] +!include vercl.vc +!endif +!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] !endif !endif

diff --git a/Makefile.vc b/Makefile.vc index c4d06ab..4442861 100644 --- a/Makefile.vc +++ b/Makefile.vc @@ -137,18 +137,15 @@ VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![cl -nologo -TC -P vercl.x >NUL] !include vercl.i -!if ![del /q vercl.i vercl.x >NUL] +!if ![echo VCVER= ^\> vercl.vc] \ + && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] +!include vercl.vc !endif -!if $(VCVERSION) >= 1500 -VCVER=9 -!elseif $(VCVERSION) >= 1400 -VCVER=8 -!elseif $(VCVERSION) >= 1300 -VCVER=7 -!elseif $(VCVERSION) >= 1200 -VCVER=6 +!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] !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 @@ -375,7 +372,7 @@ $(BUILD)\tclkit.res: ....\tclkit.rc .PHONY: setup files tidy clean

files: - @$(CPY) ....\files $(BUILD)\files^\ + @$(CPY) ....\files $(BUILD)\files\

setup:

@if not exist $(BUILD) mkdir $(BUILD)

1.7.9

-Steve Tarr