Skip to content
Permalink
Browse files
Updated zlib to 1.2.2.
  • Loading branch information
icculus committed Jul 13, 2005
1 parent 9131926 commit ec86fac0bb87380c212a5014a55748fc4682b633
@@ -2,6 +2,7 @@
* CHANGELOG.
*/

07132005 - Updated zlib to 1.2.2.
06122005 - Added support for mingw to Unix build process (thanks, Matze!).
03162005 - Added missing translation and Portuguese support (thanks, Danny!).
MPW support and several MacOS Classic fixes (thanks, Chris!).
@@ -6,33 +6,33 @@ libphysfsinclude_HEADERS = \

if BUILD_MACOSX

ZLIB_FILES = zlib121/adler32.c \
zlib121/compress.c \
zlib121/crc32.c \
zlib121/crc32.h \
zlib121/deflate.c \
zlib121/deflate.h \
zlib121/gzio.c \
zlib121/infback.c \
zlib121/inffast.c \
zlib121/inffast.h \
zlib121/inffixed.h \
zlib121/inflate.c \
zlib121/inflate.h \
zlib121/inftrees.c \
zlib121/inftrees.h \
zlib121/trees.c \
zlib121/trees.h \
zlib121/uncompr.c \
zlib121/zconf.h \
zlib121/zlib.h \
zlib121/zutil.c \
zlib121/zutil.h
ZLIB_FILES = zlib122/adler32.c \
zlib122/compress.c \
zlib122/crc32.c \
zlib122/crc32.h \
zlib122/deflate.c \
zlib122/deflate.h \
zlib122/gzio.c \
zlib122/infback.c \
zlib122/inffast.c \
zlib122/inffast.h \
zlib122/inffixed.h \
zlib122/inflate.c \
zlib122/inflate.h \
zlib122/inftrees.c \
zlib122/inftrees.h \
zlib122/trees.c \
zlib122/trees.h \
zlib122/uncompr.c \
zlib122/zconf.h \
zlib122/zlib.h \
zlib122/zutil.c \
zlib122/zutil.h


if BUILD_ZLIB
ZLIB_SRC = $(ZLIB_FILES)
ZLIB_INC = -I$(top_srcdir)/zlib121
ZLIB_INC = -I$(top_srcdir)/zlib122
ZLIB_EXTRADIST =
else
ZLIB_SRC =
@@ -105,15 +105,15 @@ EXTRA_DIST = \

else

SUBDIRS = platform archivers zlib121 . test extras
SUBDIRS = platform archivers zlib122 . test extras

libphysfs_la_SOURCES = \
physfs.c \
physfs_internal.h \
physfs_byteorder.c

if BUILD_ZLIB
ZLIB_LIB = zlib121/libz.la
ZLIB_LIB = zlib122/libz.la
else
ZLIB_LIB =
endif
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libphysfs.la

SUBDIRS = platform archivers zlib121 . test extras
SUBDIRS = platform archivers zlib122 . test extras

libphysfsincludedir = $(includedir)
libphysfsinclude_HEADERS = \
@@ -12,7 +12,7 @@ libphysfs_la_SOURCES = \
physfs_byteorder.c

if BUILD_ZLIB
ZLIB_LIB = zlib121/libz.la
ZLIB_LIB = zlib122/libz.la
else
ZLIB_LIB =
endif
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libarchivers.la

if BUILD_ZLIB
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib121
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib122
else
INCLUDES = -I$(top_srcdir)
endif
@@ -547,7 +547,7 @@ AC_OUTPUT([
Makefile
archivers/Makefile
platform/Makefile
zlib121/Makefile
zlib122/Makefile
test/Makefile
extras/Makefile
physfs.spec
@@ -7,8 +7,8 @@ rem Patches go to icculus@clutteredmind.org ...

set PHYSFSLANG=PHYSFS_LANG_ENGLISH
set DEBUGFLAGS=-D_NDEBUG -O2 -s
rem set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H
set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DHAVE_ASSERT_H
rem set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib122 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H
set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib122 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DHAVE_ASSERT_H

rem goto :dolinking

@@ -126,18 +126,18 @@ gcc %CFLAGS% -o bin/zip.obj archivers/zip.c
gcc %CFLAGS% -o bin/qpak.obj archivers/qpak.c
gcc %CFLAGS% -o bin/hog.obj archivers/hog.c
gcc %CFLAGS% -o bin/mvl.obj archivers/mvl.c
gcc %CFLAGS% -o bin/adler32.obj zlib121/adler32.c
gcc %CFLAGS% -o bin/compress.obj zlib121/compress.c
gcc %CFLAGS% -o bin/crc32.obj zlib121/crc32.c
gcc %CFLAGS% -o bin/deflate.obj zlib121/deflate.c
gcc %CFLAGS% -o bin/gzio.obj zlib121/gzio.c
gcc %CFLAGS% -o bin/infback.obj zlib121/infback.c
gcc %CFLAGS% -o bin/inffast.obj zlib121/inffast.c
gcc %CFLAGS% -o bin/inflate.obj zlib121/inflate.c
gcc %CFLAGS% -o bin/inftrees.obj zlib121/inftrees.c
gcc %CFLAGS% -o bin/trees.obj zlib121/trees.c
gcc %CFLAGS% -o bin/uncompr.obj zlib121/uncompr.c
gcc %CFLAGS% -o bin/zutil.obj zlib121/zutil.c
gcc %CFLAGS% -o bin/adler32.obj zlib122/adler32.c
gcc %CFLAGS% -o bin/compress.obj zlib122/compress.c
gcc %CFLAGS% -o bin/crc32.obj zlib122/crc32.c
gcc %CFLAGS% -o bin/deflate.obj zlib122/deflate.c
gcc %CFLAGS% -o bin/gzio.obj zlib122/gzio.c
gcc %CFLAGS% -o bin/infback.obj zlib122/infback.c
gcc %CFLAGS% -o bin/inffast.obj zlib122/inffast.c
gcc %CFLAGS% -o bin/inflate.obj zlib122/inflate.c
gcc %CFLAGS% -o bin/inftrees.obj zlib122/inftrees.c
gcc %CFLAGS% -o bin/trees.obj zlib122/trees.c
gcc %CFLAGS% -o bin/uncompr.obj zlib122/uncompr.c
gcc %CFLAGS% -o bin/zutil.obj zlib122/zutil.c
@echo off

:dolinking

Some generated files are not rendered by default. Learn more.

0 comments on commit ec86fac

Please sign in to comment.