From adee4009d643d2619f1cb94c20a38154beab49b1 Mon Sep 17 00:00:00 2001 From: Hirokazu Yamamoto Date: Sat, 10 Jan 2009 09:28:57 +0000 Subject: [PATCH] Merged revisions 68469 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ 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. ........ --- PC/VC6/_tkinter.dsp | 2 +- PC/VC6/readme.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PC/VC6/_tkinter.dsp b/PC/VC6/_tkinter.dsp index fb35219c157..8cda83a93ad 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\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_d.pyd" /pdbtype:sept +# 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" diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index 5c91806e289..a156d8daf0a 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -72,6 +72,10 @@ _tkinter svn export http://svn.python.org/projects/external/tk-8.5.2.0 tk8.5.2 svn export http://svn.python.org/projects/external/tix-8.4.3.1 tix8.4.3 + Debug Build + ----------- + To build debug version, add DEBUG=1 to all nmake call bellow. + Build Tcl first (done here w/ MSVC 6 on Win2K) --------------- If your environment doesn't have struct _stat64, you need to apply