diff -du -N --recursive -x '*.[ix]' -x '*~' -x '*.obj' -x '*.manifest' -x '*.src' -x '*.lib' -x '*.pdb' -x '*.dll' -x '*.exp' tix-8.4.3-original/win/makefile.vc tix-8.4.3/win/makefile.vc --- tix-8.4.3-original/win/makefile.vc 2008-03-18 00:16:01.000000000 +0100 +++ tix-8.4.3/win/makefile.vc 2008-09-27 01:36:56.031250000 +0200 @@ -215,21 +215,17 @@ !IF "$(NODEBUG)" == "1" DBGX = -TMPDIR = Release !ELSE DBGX = d -TMPDIR = Debug !ENDIF +TMPDIR = $(BUILDDIRTOP) + # # File and dir names for Tcl # -!IF "$(TCL_DBGX)" != "d" -TCL_TMPDIR = Release -!ELSE -TCL_TMPDIR = Debug -!ENDIF +TCL_TMPDIR = $(BUILDDIRTOP) !IF "$(TCL_PATCH)" == "" TCL_DIR = $(SRC_ROOT)\tcl$(TCL_MAJOR).$(TCL_MINOR) @@ -242,7 +238,7 @@ TCL_LIBDIR = $(TCL_DIR)\win\$(TCL_TMPDIR) TCL_LIB = $(TCL_LIBDIR)\tcl$(TCL_MAJOR)$(TCL_MINOR)$(TCL_DBGX).lib TCL_DLL = $(TCL_LIBDIR)\tcl$(TCL_MAJOR)$(TCL_MINOR)$(TCL_DBGX).dll -TCL_STUBLIB = $(TCL_LIBDIR)\tclstub$(TCL_MAJOR)$(TCL_MINOR)$(TCL_DBGX).lib +TCL_STUBLIB = $(TCL_LIBDIR)\tclstub$(TCL_MAJOR)$(TCL_MINOR).lib TCLSH_EXE = $(TCL_LIBDIR)\tclsh$(TCL_MAJOR)$(TCL_MINOR)$(TCL_DBGX).exe TK_LIBDIR = $(TK_DIR)\win\$(TK_TMPDIR) @@ -253,11 +249,7 @@ # File and dir names for Tk # -!IF "$(TK_DBGX)" == "d" -TK_TMPDIR = Debug -!ELSE -TK_TMPDIR = Release -!ENDIF +TK_TMPDIR = $(BUILDDIRTOP) !IF "$(TK_PATCH)" == "" TK_DIR = $(SRC_ROOT)\tk$(TK_MAJOR).$(TK_MINOR) @@ -267,7 +259,7 @@ TK_LIBDIR = $(TK_DIR)\win\$(TK_TMPDIR) TK_LIB = $(TK_LIBDIR)\tk$(TK_MAJOR)$(TK_MINOR)$(TK_DBGX).lib -TK_STUBLIB = $(TK_LIBDIR)\tkstub$(TK_MAJOR)$(TK_MINOR)$(TK_DBGX).lib +TK_STUBLIB = $(TK_LIBDIR)\tkstub$(TK_MAJOR)$(TK_MINOR).lib # # File and dir names for Tix @@ -349,6 +341,7 @@ -out:$@ @<< $(TIX_DLL_OBJS) << + $(_VC_MANIFEST_EMBED_DLL) $(TIX_PKGIDX): make_pkgIndex.tcl makefile.vc set TCL_LIBRARY=$(TCL_DIR)\library @@ -434,11 +427,11 @@ -@$(MKDIR) "$(LIB_INSTALL_DIR)\demos" -@$(MKDIR) "$(LIB_INSTALL_DIR)\demos\bitmaps" -@$(MKDIR) "$(LIB_INSTALL_DIR)\demos\samples" - xcopy "$(ROOT)\library" "$(LIB_INSTALL_DIR)" - copy "$(TIX_PKGIDX)" "$(LIB_INSTALL_DIR)\pkgIndex.tcl" - xcopy "$(ROOT)\library\pref" "$(LIB_INSTALL_DIR)\pref" - xcopy "$(ROOT)\library\bitmaps" "$(LIB_INSTALL_DIR)\bitmaps" - xcopy "$(ROOT)\demos" "$(LIB_INSTALL_DIR)\demos" - xcopy "$(ROOT)\demos\samples" "$(LIB_INSTALL_DIR)\demos\samples" - xcopy "$(ROOT)\demos\bitmaps" "$(LIB_INSTALL_DIR)\demos\bitmaps" + xcopy /y "$(ROOT)\library" "$(LIB_INSTALL_DIR)" + copy /y "$(TIX_PKGIDX)" "$(LIB_INSTALL_DIR)\pkgIndex.tcl" + xcopy /y "$(ROOT)\library\pref" "$(LIB_INSTALL_DIR)\pref" + xcopy /y "$(ROOT)\library\bitmaps" "$(LIB_INSTALL_DIR)\bitmaps" + xcopy /y "$(ROOT)\demos" "$(LIB_INSTALL_DIR)\demos" + xcopy /y "$(ROOT)\demos\samples" "$(LIB_INSTALL_DIR)\demos\samples" + xcopy /y "$(ROOT)\demos\bitmaps" "$(LIB_INSTALL_DIR)\demos\bitmaps" diff -du -N --recursive -x '*.[ix]' -x '*~' -x '*.obj' -x '*.manifest' -x '*.src' -x '*.lib' -x '*.pdb' -x '*.dll' -x '*.exp' tix-8.4.3-original/win/python.mak tix-8.4.3/win/python.mak --- tix-8.4.3-original/win/python.mak 1970-01-01 01:00:00.000000000 +0100 +++ tix-8.4.3/win/python.mak 2008-09-27 01:24:54.609375000 +0200 @@ -0,0 +1,44 @@ +# Most of it was copied from tcl's rule.vc + +TOOLS32 = $(VCINSTALLDIR) + +!if $(DEBUG) +BUILDDIRTOP = Debug +NODEBUG = 0 +TCL_DBGX = g +!else +BUILDDIRTOP = Release +NODEBUG = 1 +!endif + +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 +!endif +!endif + +!if "$(MACHINE)" != "IX86" +BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE) +!endif +!if $(VCVER) > 6 +BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER) +!endif + +# Since MSVC8 we must deal with manifest resources. +_VC_MANIFEST_EMBED_EXE= +_VC_MANIFEST_EMBED_DLL= +!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 + +!include makefile.vc