Only in tix8.4.2/win/: Release diff -u Tix8.4.2-src/Tix8.4.2/win/makefile.vc tix8.4.2/win/makefile.vc --- Tix8.4.2-src/Tix8.4.2/win/makefile.vc Fri Nov 17 06:33:32 2006 +++ tix8.4.2/win/makefile.vc Sun Nov 18 15:45:22 2007 @@ -122,8 +122,8 @@ link32 = "$(TOOLS32)\bin\link.exe" include32 = -I"$(TOOLS32)\include" -RMDIR = $(TCL_DIR)\win\rmd.bat -MKDIR = $(TCL_DIR)\win\mkd.bat +RMDIR = $(TK_DIR)\win\rmd.bat +MKDIR = $(TK_DIR)\win\mkd.bat RM = del # @@ -137,7 +137,7 @@ !ENDIF # declarations common to all linker options -lcommon = /NODEFAULTLIB /RELEASE /NOLOGO +lcommon = /RELEASE /NOLOGO # declarations for use on Intel i386, i486, and Pentium systems !IF "$(MACHINE)" == "IX86" @@ -222,6 +222,25 @@ TMPDIR = Debug !ENDIF +#---------------------------------------------------------- +# MSVC8 (ships with Visual Studio 2005) generates a manifest +# file that we should link into the binaries. This is how. +#---------------------------------------------------------- + +_VC_MANIFEST_EMBED_EXE= +_VC_MANIFEST_EMBED_DLL= +!if ![cl /Zs /Tc NUL 2>&1 | find "Version 12" > NUL] +VCVER=6 +!elseif ![cl /Zs /Tc NUL 2>&1 | find "Version 13" > NUL] +VCVER=7 +!elseif ![cl /Zs /Tc NUL 2>&1 | find "Version 14" > NUL] +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 +!else +VCVER=0 +!endif + # # File and dir names for Tcl # @@ -232,6 +251,10 @@ TCL_TMPDIR = Debug !ENDIF +!IF $(VCVER) > 6 +TCL_TMPDIR =$(TCL_TMPDIR)_VC$(VCVER) +!ENDIF + !IF "$(TCL_PATCH)" == "" TCL_DIR = $(SRC_ROOT)\tcl$(TCL_MAJOR).$(TCL_MINOR) TK_DIR = $(SRC_ROOT)\tk$(TCL_MAJOR).$(TCL_MINOR) @@ -258,6 +281,10 @@ TK_TMPDIR = Debug !ELSE TK_TMPDIR = Release +!ENDIF + +!IF $(VCVER) > 6 +TK_TMPDIR =$(TK_TMPDIR)_VC$(VCVER) !ENDIF !IF "$(TK_PATCH)" == "" Only in tix8.4.2/win/: python.mak