Mercurial > cpython-lru_cache-weakref
annotate PC/tix.diff @ 37850:ebe59cd18273
Use explicit relative import for an, ehm, relative import.
| author | Thomas Wouters <thomas@python.org> |
|---|---|
| date | Tue, 18 Apr 2006 21:41:36 +0000 |
| parents | f0053a6a2bed |
| children |
| rev | line source |
|---|---|
| 33351 | 1 diff -ur tix-8.1.4/win/common.mak tix-8.1.4.new/win/common.mak |
| 2 --- tix-8.1.4/win/common.mak 2002-12-11 07:19:42.000000000 +0100 | |
| 3 +++ tix-8.1.4.new/win/common.mak 2004-08-03 21:45:09.859375000 +0200 | |
| 4 @@ -18,10 +18,10 @@ | |
| 5 # support files | |
| 6 # | |
| 7 #---------------------------------------------------------------------- | |
| 8 -TCL_VER = 8.3 | |
| 9 +TCL_VER = 8.4 | |
| 10 ITCL_VER = | |
| 11 | |
| 12 -INSTALLDIR = C:\progra~1\tcl | |
|
33381
f0053a6a2bed
Fix installdir for Tix
Martin v. Löwis <martin@v.loewis.de>
parents:
33351
diff
changeset
|
13 +INSTALLDIR = ..\..\tcltk |
| 33351 | 14 |
| 15 !IFNDEF TIX_DEBUG | |
| 16 NODEBUG = 1 | |
| 17 @@ -61,7 +61,7 @@ | |
| 18 !IF "$(TCL_VER)" == "8.4" | |
| 19 TCLMAJOR=8 | |
| 20 TCLMINOR=4 | |
| 21 -TCLPATCH=1 | |
| 22 +TCLPATCH=7 | |
| 23 TMPDIR = tk$(TCL_VER) | |
| 24 !ENDIF | |
| 25 | |
| 26 @@ -176,14 +176,14 @@ | |
| 27 $(TMPDIR)\tixWinWm.obj | |
| 28 | |
| 29 RMDIR = $(TCLDIR)\win\rmd.bat | |
| 30 -MKDIR = $(TCLDIR)\win\mkd.bat | |
| 31 +MKDIR = mkdir | |
| 32 RM = del | |
| 33 | |
| 34 install: install-binaries install-libraries | |
| 35 | |
| 36 install-binaries: $(TCLSH) | |
| 37 - $(MKDIR) "$(BIN_INSTALL_DIR)" | |
| 38 - $(MKDIR) "$(LIB_INSTALL_DIR)" | |
| 39 + -$(MKDIR) "$(BIN_INSTALL_DIR)" | |
| 40 + -$(MKDIR) "$(LIB_INSTALL_DIR)" | |
| 41 @echo installing $(TIXDLL) | |
| 42 @copy "$(TIXDLL)" "$(BIN_INSTALL_DIR)" | |
| 43 @copy "$(TIXLIB)" "$(LIB_INSTALL_DIR)" | |
| 44 diff -ur tix-8.1.4/win/makefile.vc tix-8.1.4.new/win/makefile.vc | |
| 45 --- tix-8.1.4/win/makefile.vc 2002-12-02 04:02:54.000000000 +0100 | |
| 46 +++ tix-8.1.4.new/win/makefile.vc 2004-08-03 21:42:07.953125000 +0200 | |
| 47 @@ -54,12 +54,11 @@ | |
| 48 DBGX = d | |
| 49 !ENDIF | |
| 50 | |
| 51 -cc32 = "$(TOOLS32)\bin\cl.exe" | |
| 52 -rc32 = "$(TOOLS32_rc)\bin\rc.exe" | |
| 53 -link32 = "$(TOOLS32)\bin\link.exe" | |
| 54 -include32 = -I"$(TOOLS32)\include" | |
| 55 +cc32 = "cl.exe" | |
| 56 +rc32 = "rc.exe" | |
| 57 +link32 = "link.exe" | |
| 58 | |
| 59 -TIX_INCLUDES = $(include32) \ | |
| 60 +TIX_INCLUDES = \ | |
| 61 -I$(ROOT)\win -I$(ROOT)\generic \ | |
| 62 -I$(TKDIR)\generic -I$(TKDIR)\win -I$(TKDIR)\xlib \ | |
| 63 -I$(TCLDIR)\generic $(ITCL_CFLAGS) | |
| 64 @@ -171,7 +170,7 @@ | |
| 65 # | |
| 66 cvarsdll = -D_X86_=1 -DWIN32 -D_WIN32 -D_MT -D_DLL | |
| 67 cflagsdll = $(cvarsdll) -c -W3 -nologo -Fp$(TMPDIR)\ -YX -MD \ | |
| 68 - -Oti -Gs -GD | |
| 69 + -Oti -Gs -Gd | |
| 70 | |
| 71 ###################################################################### | |
| 72 # Project specific targets | |
| 73 @@ -181,7 +180,6 @@ | |
| 74 | |
| 75 $(DUMPEXTS): $(WINDIR)\winDumpExts.c | |
| 76 $(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ /c $? | |
| 77 - set LIB="$(TOOLS32)\lib" | |
| 78 $(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \ | |
| 79 $(TMPDIR)\winDumpExts.obj | |
| 80 | |
| 81 @@ -193,7 +191,6 @@ | |
| 82 # (ToDo) $(TIXDLL) doesn't have resources to define its icon, etc. | |
| 83 # | |
| 84 $(TIXDLL): $(TIXOBJS) $(TMPDIR)\tixvc.def | |
| 85 - set LIB="$(TOOLS32)\lib" | |
| 86 $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tixvc.def \ | |
| 87 $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) $(guilibsdll) \ | |
| 88 $(ITCL_LIBS) -out:$@ @<< | |
| 89 @@ -202,7 +199,6 @@ | |
| 90 | |
| 91 | |
| 92 $(TIXWISH): $(WISHOBJS) $(TIXOBJS) $(TIXLIB) $(TMPDIR)\tixwish.res | |
| 93 - set LIB="$(TOOLS32)\lib" | |
| 94 $(link32) $(ldebug) $(guilflags) \ | |
| 95 $(WISHOBJS) $(TMPDIR)\tixwish.res $(TIXLIB) \ | |
| 96 $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) $(guilibsdll) \ | |
| 97 diff -ur tix-8.1.4/win/tk8.4/pkgIndex.tcl tix-8.1.4.new/win/tk8.4/pkgIndex.tcl | |
| 98 --- tix-8.1.4/win/tk8.4/pkgIndex.tcl 2002-12-15 04:21:54.000000000 +0100 | |
| 99 +++ tix-8.1.4.new/win/tk8.4/pkgIndex.tcl 2004-08-31 08:38:43.921875000 +0200 | |
| 100 @@ -15,7 +15,7 @@ | |
| 101 # We look in the ../../bin directory (an installed Tcl) | |
| 102 lappend dirs ../../bin | |
| 103 # We look in the ../../DLLs directory (an installed Python) | |
| 104 -lappend dirs ../../Dlls | |
| 105 +lappend dirs [file join [file dirname [info nameofexe]] DLLs] | |
| 106 # If not, this pkgIndex.tcl will probably fail. | |
| 107 | |
| 108 |