Now using static zlib 1.1.3

diff --git a/PCbuild/zlib.dsp b/PCbuild/zlib.dsp
index fdcaf22e81532bfc6e48f6ee75615c5f0144e6cf..1d164939321a5d07af7744f4b4c8dbc4ce4a16e8 100644 (file)
--- a/PCbuild/zlib.dsp
+++ b/PCbuild/zlib.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib104forvc" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -53,7 +53,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 /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlibvc104dll\zlib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./zlib.pyd" /libpath:"Release" /export:initzlib\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /libpath:"Release" /export:initzlib\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib104forvc" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -81,7 +81,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 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlibvc104dll\zlib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./zlib_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initzlib\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initzlib\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r