diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-01-10 11:48:27 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-01-10 11:48:27 (GMT) |
| commit | 6c7e56231093f3554df0fd1bc09906f5100f5633 (patch) | |
| tree | 2894fd09e3fdda79d301699dd094d4714b3f76be /PC/VC6/_tkinter.dsp | |
| parent | 5ec09599469fecf810e95a044e44f407d13b4bb6 (diff) | |
| download | cpython-6c7e56231093f3554df0fd1bc09906f5100f5633.zip cpython-6c7e56231093f3554df0fd1bc09906f5100f5633.tar.gz cpython-6c7e56231093f3554df0fd1bc09906f5100f5633.tar.bz2 | |
Merged revisions 68468-68470 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68468 | hirokazu.yamamoto | 2009-01-10 17:09:43 +0900 | 1 line
Bump up Tcl/Tk version on VC6. (tcl8.4.12 -> tcl8.5.2, tk8.4.12 -> tk8.5.2, tix8.4.0 -> tix8.4.3)
........
r68469 | hirokazu.yamamoto | 2009-01-10 17:12:09 +0900 | 1 line
Link to debug version of Tcl/Tk when python is built as debug version.
........
r68470 | hirokazu.yamamoto | 2009-01-10 18:18:16 +0900 | 1 line
Added helper script to build Tcl/Tk.
........
Diffstat (limited to 'PC/VC6/_tkinter.dsp')
| -rw-r--r-- | PC/VC6/_tkinter.dsp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PC/VC6/_tkinter.dsp b/PC/VC6/_tkinter.dsp index d06198c..8cda83a 100644 --- a/PC/VC6/_tkinter.dsp +++ b/PC/VC6/_tkinter.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib"
+# ADD LINK32 ..\..\..\tcltk\lib\tk85g.lib ..\..\..\tcltk\lib\tcl85g.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_tkinter - Win32 Release"
@@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 ..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib"
+# ADD LINK32 ..\..\..\tcltk\lib\tk85.lib ..\..\..\tcltk\lib\tcl85.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd"
# SUBTRACT LINK32 /pdb:none
!ENDIF
|