From d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804 Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika
Date: Mon, 4 Feb 2013 23:45:44 -0500
Subject: Fully integrate BassAceGold's libraries, finally. The README still
states that 1.2 is required to overwrite 0.13's stuff; really, 0.13 is needed
only for `gcc`. So the sequence goes 0.13's `gcc` -> 1.2 -> BassAceGold's
libraries -> make `libds2a.a`.
DMA function names changed to match BassAceGold's.
---
sdk-modifications/libsrc/zlib/README | 9 ++++++++-
sdk-modifications/libsrc/zlib/adler32.c | 0
sdk-modifications/libsrc/zlib/compress.c | 0
sdk-modifications/libsrc/zlib/crc32.c | 0
sdk-modifications/libsrc/zlib/crc32.h | 0
sdk-modifications/libsrc/zlib/deflate.c | 0
sdk-modifications/libsrc/zlib/deflate.h | 0
sdk-modifications/libsrc/zlib/gzclose.c | 0
sdk-modifications/libsrc/zlib/gzguts.h | 0
sdk-modifications/libsrc/zlib/gzlib.c | 0
sdk-modifications/libsrc/zlib/gzread.c | 0
sdk-modifications/libsrc/zlib/gzwrite.c | 0
sdk-modifications/libsrc/zlib/infback.c | 0
sdk-modifications/libsrc/zlib/inffast.c | 0
sdk-modifications/libsrc/zlib/inffast.h | 0
sdk-modifications/libsrc/zlib/inffixed.h | 0
sdk-modifications/libsrc/zlib/inflate.c | 0
sdk-modifications/libsrc/zlib/inflate.h | 0
sdk-modifications/libsrc/zlib/inftrees.c | 0
sdk-modifications/libsrc/zlib/inftrees.h | 0
sdk-modifications/libsrc/zlib/trees.c | 0
sdk-modifications/libsrc/zlib/trees.h | 0
sdk-modifications/libsrc/zlib/uncompr.c | 0
sdk-modifications/libsrc/zlib/zconf.h | 4 ++--
sdk-modifications/libsrc/zlib/zlib.h | 0
sdk-modifications/libsrc/zlib/zlib.mk | 0
sdk-modifications/libsrc/zlib/zutil.c | 0
sdk-modifications/libsrc/zlib/zutil.h | 0
28 files changed, 10 insertions(+), 3 deletions(-)
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/adler32.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/compress.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/crc32.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/crc32.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/deflate.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/deflate.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/gzclose.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/gzguts.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/gzlib.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/gzread.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/gzwrite.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/infback.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/inffast.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/inffast.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/inffixed.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/inflate.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/inflate.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/inftrees.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/inftrees.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/trees.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/trees.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/uncompr.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/zlib.h
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/zlib.mk
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/zutil.c
mode change 100644 => 100755 sdk-modifications/libsrc/zlib/zutil.h
(limited to 'sdk-modifications/libsrc/zlib')
diff --git a/sdk-modifications/libsrc/zlib/README b/sdk-modifications/libsrc/zlib/README
index ee06114..90f3327 100644
--- a/sdk-modifications/libsrc/zlib/README
+++ b/sdk-modifications/libsrc/zlib/README
@@ -1 +1,8 @@
-This is a modified source release of zlib. zconf.h removes a reference to sys/types.h, which creates type conflicts on the DS2 SDK. For a pristine source release of zlib, please visit .
\ No newline at end of file
+This is a modified source release of zlib.
+
+Changes:
+ zconf.h removes a reference to sys/types.h, which creates type conflicts on the DS2 SDK.
+ gzguts.h removes standard c library includes for DS2 SDK equivalents
+
+
+For a pristine source release of zlib, please visit .
\ No newline at end of file
diff --git a/sdk-modifications/libsrc/zlib/adler32.c b/sdk-modifications/libsrc/zlib/adler32.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/compress.c b/sdk-modifications/libsrc/zlib/compress.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/crc32.c b/sdk-modifications/libsrc/zlib/crc32.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/crc32.h b/sdk-modifications/libsrc/zlib/crc32.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/deflate.c b/sdk-modifications/libsrc/zlib/deflate.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/deflate.h b/sdk-modifications/libsrc/zlib/deflate.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/gzclose.c b/sdk-modifications/libsrc/zlib/gzclose.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/gzguts.h b/sdk-modifications/libsrc/zlib/gzguts.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/gzlib.c b/sdk-modifications/libsrc/zlib/gzlib.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/gzread.c b/sdk-modifications/libsrc/zlib/gzread.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/gzwrite.c b/sdk-modifications/libsrc/zlib/gzwrite.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/infback.c b/sdk-modifications/libsrc/zlib/infback.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/inffast.c b/sdk-modifications/libsrc/zlib/inffast.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/inffast.h b/sdk-modifications/libsrc/zlib/inffast.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/inffixed.h b/sdk-modifications/libsrc/zlib/inffixed.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/inflate.c b/sdk-modifications/libsrc/zlib/inflate.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/inflate.h b/sdk-modifications/libsrc/zlib/inflate.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/inftrees.c b/sdk-modifications/libsrc/zlib/inftrees.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/inftrees.h b/sdk-modifications/libsrc/zlib/inftrees.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/trees.c b/sdk-modifications/libsrc/zlib/trees.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/trees.h b/sdk-modifications/libsrc/zlib/trees.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/uncompr.c b/sdk-modifications/libsrc/zlib/uncompr.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/zconf.h b/sdk-modifications/libsrc/zlib/zconf.h
index 96810e7..587a87c 100644
--- a/sdk-modifications/libsrc/zlib/zconf.h
+++ b/sdk-modifications/libsrc/zlib/zconf.h
@@ -399,8 +399,8 @@ typedef uLong FAR uLongf;
#ifdef STDC
# ifndef Z_SOLO
// # include /* for off_t */
-// Does not work with the DS2 SDK. There is a type conflict between sys/types.h
-// and fs_api.h.
+// Doesn't work on the DS2 SDK, because there are type conflicts between
+// sys/types.h and the filesystem API.//# include /* for off_t */
# endif
#endif
diff --git a/sdk-modifications/libsrc/zlib/zlib.h b/sdk-modifications/libsrc/zlib/zlib.h
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/zlib.mk b/sdk-modifications/libsrc/zlib/zlib.mk
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/zutil.c b/sdk-modifications/libsrc/zlib/zutil.c
old mode 100644
new mode 100755
diff --git a/sdk-modifications/libsrc/zlib/zutil.h b/sdk-modifications/libsrc/zlib/zutil.h
old mode 100644
new mode 100755
--
cgit v1.2.3