From f63b29b1ecde50618e92c069fb04d8e0ae6e63ae Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Mon, 6 Jun 2005 11:16:14 +0000
Subject: Updated zlib, adding hashing functions, and introducing first bits of
 a new sliding window generic algorithm.

---
 compile/linux/Makefile | 13 +++++++++----
 compile/win32/Makefile | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'compile')

diff --git a/compile/linux/Makefile b/compile/linux/Makefile
index 8c5632d..d0443c6 100644
--- a/compile/linux/Makefile
+++ b/compile/linux/Makefile
@@ -41,10 +41,10 @@ ZLIB_SOURCES = \
 ../../generic/lib/zlib/src/adler32.c   ../../generic/lib/zlib/src/inffast.c \
 ../../generic/lib/zlib/src/compress.c  ../../generic/lib/zlib/src/inflate.c \
 ../../generic/lib/zlib/src/crc32.c     ../../generic/lib/zlib/src/inftrees.c \
-../../generic/lib/zlib/src/deflate.c   ../../generic/lib/zlib/src/infutil.c \
+../../generic/lib/zlib/src/deflate.c   \
 ../../generic/lib/zlib/src/gzio.c      ../../generic/lib/zlib/src/trees.c \
 ../../generic/lib/zlib/src/infblock.c  ../../generic/lib/zlib/src/uncompr.c \
-../../generic/lib/zlib/src/infcodes.c  ../../generic/lib/zlib/src/zutil.c
+../../generic/lib/zlib/src/zutil.c
 
 LUA_SOURCES = \
 ../../generic/lib/lua/src/lapi.c      ../../generic/lib/lua/src/lparser.c \
@@ -68,6 +68,10 @@ LUA_SOURCES = \
 ../../generic/lib/lua/src/LuaLib/ltablib.c \
 ../../generic/lib/lua/src/LuaLib/ldirlib.c
 
+HASH_SOURCES = \
+../../generic/lib/hashtab.c    ../../generic/lib/lookupa.c \
+../../generic/lib/recycle.c
+
 PSX_SOURCES = \
 ../../lib/cdabstract.cpp  ../../lib/luacd.cpp  \
 ../../lib/cdreader.cpp    ../../lib/luapsx.cpp \
@@ -79,8 +83,9 @@ PSXDEV_SOURCES = \
 ../../psxdev/idctfst.c  ../../psxdev/vlc.c
 
 COMMON_SOURCES = \
-$(BALTISOT_SOURCES) $(ZLIB_SOURCES) $(REGEX_SOURCES) $(GETOPT_SOURCES)\
-$(LUA_SOURCES) $(PSX_SOURCES) $(PSXDEV_SOURCES) $(READLINE_SOURCES)
+$(BALTISOT_SOURCES) $(ZLIB_SOURCES) $(REGEX_SOURCES) $(GETOPT_SOURCES) \
+$(LUA_SOURCES) $(PSX_SOURCES) $(PSXDEV_SOURCES) $(READLINE_SOURCES) \
+$(HASH_SOURCES)
 
 WHOLE_SOURCES = $(SOURCES) $(COMMON_SOURCES) $(MOGLTK_SOURCES)
 
diff --git a/compile/win32/Makefile b/compile/win32/Makefile
index f26829a..b5dd4b3 100644
--- a/compile/win32/Makefile
+++ b/compile/win32/Makefile
@@ -13,7 +13,7 @@ INCLUDES = -I../../includes -I../../psxdev -I../../generic/include \
 
 CPPFLAGS = $(INCLUDES) -O4 -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC -fexceptions
 
-LDFLAGS = -march=i586 -O4
+LDFLAGS =
 
 SOURCES = \
 ../../cd-tool.cpp ../../luapatch.cpp
@@ -42,10 +42,10 @@ ZLIB_SOURCES = \
 ../../generic/lib/zlib/src/adler32.c   ../../generic/lib/zlib/src/inffast.c \
 ../../generic/lib/zlib/src/compress.c  ../../generic/lib/zlib/src/inflate.c \
 ../../generic/lib/zlib/src/crc32.c     ../../generic/lib/zlib/src/inftrees.c \
-../../generic/lib/zlib/src/deflate.c   ../../generic/lib/zlib/src/infutil.c \
+../../generic/lib/zlib/src/deflate.c   \
 ../../generic/lib/zlib/src/gzio.c      ../../generic/lib/zlib/src/trees.c \
 ../../generic/lib/zlib/src/infblock.c  ../../generic/lib/zlib/src/uncompr.c \
-../../generic/lib/zlib/src/infcodes.c  ../../generic/lib/zlib/src/zutil.c
+../../generic/lib/zlib/src/zutil.c
 
 LUA_SOURCES = \
 ../../generic/lib/lua/src/lapi.c      ../../generic/lib/lua/src/lparser.c \
@@ -69,6 +69,10 @@ LUA_SOURCES = \
 ../../generic/lib/lua/src/LuaLib/ltablib.c \
 ../../generic/lib/lua/src/LuaLib/ldirlib.c
 
+HASH_SOURCES = \
+../../generic/lib/hashtab.c    ../../generic/lib/lookupa.c \
+../../generic/lib/recycle.c
+
 PSX_SOURCES = \
 ../../lib/cdabstract.cpp  ../../lib/luacd.cpp  \
 ../../lib/cdreader.cpp    ../../lib/luapsx.cpp \
@@ -86,8 +90,9 @@ GETOPT_SOURCES = \
 ../../MSVC/getopt/getopt.c  ../../MSVC/getopt/getopt1.c
 
 COMMON_SOURCES = \
-$(BALTISOT_SOURCES) $(ZLIB_SOURCES) $(REGEX_SOURCES) $(GETOPT_SOURCES)\
-$(LUA_SOURCES) $(PSX_SOURCES) $(PSXDEV_SOURCES) $(READLINE_SOURCES)
+$(BALTISOT_SOURCES) $(ZLIB_SOURCES) $(REGEX_SOURCES) $(GETOPT_SOURCES) \
+$(LUA_SOURCES) $(PSX_SOURCES) $(PSXDEV_SOURCES) $(READLINE_SOURCES) \
+$(HASH_SOURCES)
 
 WHOLE_SOURCES = $(SOURCES) $(COMMON_SOURCES) $(MOGLTK_SOURCES)
 
-- 
cgit v1.2.3