From 86dc6d9ebc81c84e4b8963bab9ccfbda5012264a Mon Sep 17 00:00:00 2001 From: bhook Date: Mon, 22 Dec 2003 18:19:09 +0000 Subject: [PATCH] Converted VC6 project to use zlib121, fixed some link warnings that Z_PREFIX=1 missed by default, enabled Z_PREFIX=1 by default in VC6 dsp file, updated changelog. --- CHANGELOG | 5 ++- physfs_static.dsp | 92 ++++++++++++----------------------------------- zlib121/zconf.h | 24 ++++++++++++- 3 files changed, 50 insertions(+), 71 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 07afdb2c..d179692d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,10 @@ /* * CHANGELOG. */ - +12222003 - Converted VC6 .dsp to use zlib121; made Z_PREFIX=1 enabled by + default to avoid link clashes; put zlib files in separate + logical folder in .dsp project; updated zlib121/zconf.h to + address remaining symbols that were still causing link warnings 12222003 - Fixed a search-and-replace mistake in win32.c that preventing compiling on Windows. (thanks, Brian!) 12182003 - WAD archiver now puts maps into subdirectories, making them diff --git a/physfs_static.dsp b/physfs_static.dsp index 64eb39e4..c9b1fa0a 100644 --- a/physfs_static.dsp +++ b/physfs_static.dsp @@ -40,8 +40,9 @@ RSC=rc.exe # PROP Output_Dir "physfs_static_release" # PROP Intermediate_Dir "physfs_static_release" # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "zlib114" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "zlib121" /I "../physfs" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /D Z_PREFIX=1 /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -63,8 +64,9 @@ LIB32=link.exe -lib # PROP Output_Dir "physfs_static_debug" # PROP Intermediate_Dir "physfs_static_debug" # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "zlib114" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "zlib121" /I "../physfs" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PHYSFS_SUPPORTS_QPAK=1 /D PHYSFS_SUPPORTS_ZIP=1 /D PHYSFS_SUPPORTS_HOG=1 /D PHYSFS_SUPPORTS_GRP=1 /D PHYSFS_SUPPORTS_WAD=1 /D PHYSFS_SUPPORTS_MVL=1 /D Z_PREFIX=1 /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -83,61 +85,65 @@ LIB32=link.exe -lib # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Group "zlib" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\zlib114\adler32.c +SOURCE=.\zlib121\adler32.c # End Source File # Begin Source File -SOURCE=.\zlib114\compress.c +SOURCE=.\zlib121\compress.c # End Source File # Begin Source File -SOURCE=.\zlib114\crc32.c +SOURCE=.\zlib121\crc32.c # End Source File # Begin Source File -SOURCE=.\zlib114\deflate.c +SOURCE=.\zlib121\deflate.c # End Source File # Begin Source File -SOURCE=.\archivers\dir.c +SOURCE=.\zlib121\infback.c # End Source File # Begin Source File -SOURCE=.\archivers\grp.c +SOURCE=.\zlib121\inffast.c # End Source File # Begin Source File -SOURCE=.\archivers\wad.c +SOURCE=.\zlib121\inflate.c # End Source File # Begin Source File -SOURCE=.\archivers\hog.c +SOURCE=.\zlib121\inftrees.c # End Source File # Begin Source File -SOURCE=.\zlib114\infblock.c +SOURCE=.\zlib121\trees.c # End Source File # Begin Source File -SOURCE=.\zlib114\infcodes.c +SOURCE=.\zlib121\uncompr.c # End Source File # Begin Source File -SOURCE=.\zlib114\inffast.c +SOURCE=.\zlib121\zutil.c # End Source File +# End Group # Begin Source File -SOURCE=.\zlib114\inflate.c +SOURCE=.\archivers\dir.c # End Source File # Begin Source File -SOURCE=.\zlib114\inftrees.c +SOURCE=.\archivers\grp.c # End Source File # Begin Source File -SOURCE=.\zlib114\infutil.c +SOURCE=.\archivers\hog.c # End Source File # Begin Source File @@ -157,11 +163,7 @@ SOURCE=.\archivers\qpak.c # End Source File # Begin Source File -SOURCE=.\zlib114\trees.c -# End Source File -# Begin Source File - -SOURCE=.\zlib114\uncompr.c +SOURCE=.\archivers\wad.c # End Source File # Begin Source File @@ -171,66 +173,18 @@ SOURCE=.\platform\win32.c SOURCE=.\archivers\zip.c # End Source File -# Begin Source File - -SOURCE=.\zlib114\zutil.c -# End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\zlib114\deflate.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\infblock.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\infcodes.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\inffast.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\inffixed.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\inftrees.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\infutil.h -# End Source File -# Begin Source File - SOURCE=.\physfs.h # End Source File # Begin Source File SOURCE=.\physfs_internal.h # End Source File -# Begin Source File - -SOURCE=.\zlib114\trees.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\zconf.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\zlib.h -# End Source File -# Begin Source File - -SOURCE=.\zlib114\zutil.h -# End Source File # End Group # End Target # End Project diff --git a/zlib121/zconf.h b/zlib121/zconf.h index 5def0090..6846b798 100644 --- a/zlib121/zconf.h +++ b/zlib121/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zconf.h,v 1.1 2003/12/07 05:29:20 icculus Exp $ */ +/* @(#) $Id: zconf.h,v 1.2 2003/12/22 18:19:09 bhook Exp $ */ #ifndef ZCONF_H #define ZCONF_H @@ -50,6 +50,28 @@ # define uLongf z_uLongf # define voidpf z_voidpf # define voidp z_voidp + +# define inflate_table z_inflate_table +# define inflate_copyright z_inflate_copyright +# define inflate_fast z_inflate_fast +# define inflateBackInit_ z_inflateBackInit_ +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define deflate_copyright z_deflate_copyright +# define zlibVersion z_zlibVersion +# define zlibCompileFlags z_zlibCompileFlags +# define zError z_zError +# define zcalloc z_zcalloc +# define zcfree z_zcfree +# define z_errmsg z_z_errmsg +# define _tr_init z_tr_init +# define _tr_stored_block z_tr_stored_block +# define _tr_flush_block z_tr_flush_block +# define _tr_tally z_tr_tally +# define _length_code z_length_code +# define _dist_code z_dist_code +# define _tr_align z_tr_align + #endif #if defined(__MSDOS__) && !defined(MSDOS)