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.
........

diff --git a/PC/VC6/_tkinter.dsp b/PC/VC6/_tkinter.dsp
index fb35219c1571fa8d7e5b313b76ec3fc9fddbb4c2..8cda83a93adc2c9efd051a593e3dd0e8d320f0f6 100644 (file)
--- a/PC/VC6/_tkinter.dsp
+++ b/PC/VC6/_tkinter.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
+# 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\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "_tkinter - Win32 Release"\r

diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index 5c91806e289f936d4f58727ed634f0c962fc217c..a156d8daf0aa98eb3d6d6f3094dbf47df1bce215 100644 (file)
--- 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