[Python-checkins] CVS: python/dist/src/PCbuild zlib.dsp,1.15,1.15.4.1

[Tim Peters]

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv16590/212/dist/src/PCbuild

Modified Files:
      Tag: release21-maint
	zlib.dsp 
Log Message:
Change 2.1.3 Windows build to use zlib 1.1.4.


Index: zlib.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/zlib.dsp,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -C2 -d -r1.15 -r1.15.4.1
*** zlib.dsp	31 Jan 2001 10:28:03 -0000	1.15
--- zlib.dsp	8 Apr 2002 18:06:42 -0000	1.15.4.1
***************
*** 45,49 ****
  F90=df.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 "..\Include" /I "..\PC" /I "..\..\zlib-1.1.3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 45,49 ----
  F90=df.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 "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 55,64 ****
  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 ..\..\zlib-1.1.3\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /export:initzlib
  # SUBTRACT LINK32 /pdb:none
  # Begin Special Build Tool
  SOURCE="$(InputPath)"
  PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.3	nmake -nologo -f msdos\makefile.w32 zlib.lib
  # End Special Build Tool
  
--- 55,64 ----
  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 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /export:initzlib
  # SUBTRACT LINK32 /pdb:none
  # Begin Special Build Tool
  SOURCE="$(InputPath)"
  PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
  # End Special Build Tool
  
***************
*** 78,82 ****
  F90=df.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 "..\Include" /I "..\PC" /I "..\..\zlib-1.1.3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 78,82 ----
  F90=df.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 "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 88,97 ****
  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 ..\..\zlib-1.1.3\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept /export:initzlib
  # SUBTRACT LINK32 /pdb:none
  # Begin Special Build Tool
  SOURCE="$(InputPath)"
  PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.3	nmake -nologo -f msdos\makefile.w32 zlib.lib
  # End Special Build Tool
  
--- 88,97 ----
  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 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept /export:initzlib
  # SUBTRACT LINK32 /pdb:none
  # Begin Special Build Tool
  SOURCE="$(InputPath)"
  PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib
  # End Special Build Tool