diff --git a/PCbuild/_tkinter.dsp b/PCbuild/_tkinter.dsp index 9d75dd980e7..36142ca3650 100644 --- a/PCbuild/_tkinter.dsp +++ b/PCbuild/_tkinter.dsp @@ -109,7 +109,7 @@ LINK32=link.exe F90=df.exe CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /I "..\..\tcl8.3\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -140,7 +140,7 @@ LINK32=link.exe F90=df.exe CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /I "..\..\tcl8.3\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse index 4cce1c7ebb5..3da61f7ffcd 100644 --- a/PCbuild/python20.wse +++ b/PCbuild/python20.wse @@ -26,11 +26,11 @@ item: Global Variable Flags2=00001001 Variable Name3=_SRC_ Variable Description3=Python source directory - Variable Default3=C:\src\Python-2.0 + Variable Default3=C:\code\python\dist\src Variable Flags3=00001001 Variable Name4=_DOC_ Variable Description4=HTML documentation tree directory - Variable Default4=C:\src\Python-2.0\html + Variable Default4=C:\python16\doc Variable Flags4=00001001 Variable Name5=_TCLMINOR_ Variable Description5=Tcl/Tk Minor Version (e.g. the "3" in "8.3.1") diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index c64267f6622..7ff01398b16 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -60,27 +60,39 @@ winsound The following subprojects will generally NOT build out of the box. They wrap code Python doesn't control, and you'll need to download the base -packages first (study the subproject structure from within MSVC to see -where each expects to find the unpacked packages): +packages first and unpack them into siblings of PCbuilds's parent +directory; for example, if your PCbuild is .......\dist\src\PCbuild\, +unpack into new subdirectories of dist\. _tkinter - Python wrapper for the Tk windowing system. Requires tcl831.exe from + Python wrapper for the Tk windowing system. Requires tcl832.exe from http://dev.scriptics.com/software/tcltk/downloadnow83.html + Run the installer, forcing installation into dist\Tcl. + Be sure to install everything, including the Tcl/Tk header files. zlib Python wrapper for the zlib compression library. Requires http://www.winimage.com/zLibDll/zlib133dll.zip and ftp://ftp.uu.net/graphics/png/src/zlib133.zip + Unpack the former into dist\zlib113dll. + Uppack the latter into dist\zlib113. bsddb Python wrapper for the BSD database 1.85. Requires db.1.85.win32.zip, from the "bsd db" link at http://www.nightmare.com/software.html + Unpack into dist\bsddb. + You then need to compile it: cd to dist\bsddb\Port\win32, and run + nmake -f makefile_nt.msc + This builds bsddb\Port\win32\db.lib, which the MSVC project links in. + Note that if you're running Win9X, you'll need to run vcvars32.bat + before running nmake (this batch file is in your MSVC installation). pyexpat Python wrapper for accelerated XML parsing. Requires ftp://ftp.jclark.com/pub/xml/expat.zip + Unpack into dist\expat. NOTE ON CONFIGURATIONS