aboutsummaryrefslogtreecommitdiff
path: root/sdk-modifications/libsrc/zlib
diff options
context:
space:
mode:
authorNebuleon Fumika2013-02-04 23:45:44 -0500
committerNebuleon Fumika2013-02-04 23:45:44 -0500
commitd1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804 (patch)
treed951252d393b9d7defb508483aba29e0daad764c /sdk-modifications/libsrc/zlib
parentb1c298ab5066c2e37a69c7c30bd499dd11ed6eb3 (diff)
downloadsnesemu-d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804.tar.gz
snesemu-d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804.tar.bz2
snesemu-d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804.zip
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.
Diffstat (limited to 'sdk-modifications/libsrc/zlib')
-rw-r--r--sdk-modifications/libsrc/zlib/README9
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/adler32.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/compress.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/crc32.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/crc32.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/deflate.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/deflate.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/gzclose.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/gzguts.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/gzlib.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/gzread.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/gzwrite.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/infback.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/inffast.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/inffast.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/inffixed.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/inflate.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/inflate.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/inftrees.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/inftrees.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/trees.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/trees.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/uncompr.c0
-rw-r--r--sdk-modifications/libsrc/zlib/zconf.h4
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/zlib.h0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/zlib.mk0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/zutil.c0
-rwxr-xr-x[-rw-r--r--]sdk-modifications/libsrc/zlib/zutil.h0
28 files changed, 10 insertions, 3 deletions
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 <http://zlib.net/>. \ 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 <http://zlib.net>. \ No newline at end of file
diff --git a/sdk-modifications/libsrc/zlib/adler32.c b/sdk-modifications/libsrc/zlib/adler32.c
index a868f07..a868f07 100644..100755
--- a/sdk-modifications/libsrc/zlib/adler32.c
+++ b/sdk-modifications/libsrc/zlib/adler32.c
diff --git a/sdk-modifications/libsrc/zlib/compress.c b/sdk-modifications/libsrc/zlib/compress.c
index ea4dfbe..ea4dfbe 100644..100755
--- a/sdk-modifications/libsrc/zlib/compress.c
+++ b/sdk-modifications/libsrc/zlib/compress.c
diff --git a/sdk-modifications/libsrc/zlib/crc32.c b/sdk-modifications/libsrc/zlib/crc32.c
index c12471e..c12471e 100644..100755
--- a/sdk-modifications/libsrc/zlib/crc32.c
+++ b/sdk-modifications/libsrc/zlib/crc32.c
diff --git a/sdk-modifications/libsrc/zlib/crc32.h b/sdk-modifications/libsrc/zlib/crc32.h
index c3e7171..c3e7171 100644..100755
--- a/sdk-modifications/libsrc/zlib/crc32.h
+++ b/sdk-modifications/libsrc/zlib/crc32.h
diff --git a/sdk-modifications/libsrc/zlib/deflate.c b/sdk-modifications/libsrc/zlib/deflate.c
index 8bd480e..8bd480e 100644..100755
--- a/sdk-modifications/libsrc/zlib/deflate.c
+++ b/sdk-modifications/libsrc/zlib/deflate.c
diff --git a/sdk-modifications/libsrc/zlib/deflate.h b/sdk-modifications/libsrc/zlib/deflate.h
index fbac44d..fbac44d 100644..100755
--- a/sdk-modifications/libsrc/zlib/deflate.h
+++ b/sdk-modifications/libsrc/zlib/deflate.h
diff --git a/sdk-modifications/libsrc/zlib/gzclose.c b/sdk-modifications/libsrc/zlib/gzclose.c
index caeb99a..caeb99a 100644..100755
--- a/sdk-modifications/libsrc/zlib/gzclose.c
+++ b/sdk-modifications/libsrc/zlib/gzclose.c
diff --git a/sdk-modifications/libsrc/zlib/gzguts.h b/sdk-modifications/libsrc/zlib/gzguts.h
index 5405749..5405749 100644..100755
--- a/sdk-modifications/libsrc/zlib/gzguts.h
+++ b/sdk-modifications/libsrc/zlib/gzguts.h
diff --git a/sdk-modifications/libsrc/zlib/gzlib.c b/sdk-modifications/libsrc/zlib/gzlib.c
index 7aedab8..7aedab8 100644..100755
--- a/sdk-modifications/libsrc/zlib/gzlib.c
+++ b/sdk-modifications/libsrc/zlib/gzlib.c
diff --git a/sdk-modifications/libsrc/zlib/gzread.c b/sdk-modifications/libsrc/zlib/gzread.c
index 4632e8f..4632e8f 100644..100755
--- a/sdk-modifications/libsrc/zlib/gzread.c
+++ b/sdk-modifications/libsrc/zlib/gzread.c
diff --git a/sdk-modifications/libsrc/zlib/gzwrite.c b/sdk-modifications/libsrc/zlib/gzwrite.c
index c346a64..c346a64 100644..100755
--- a/sdk-modifications/libsrc/zlib/gzwrite.c
+++ b/sdk-modifications/libsrc/zlib/gzwrite.c
diff --git a/sdk-modifications/libsrc/zlib/infback.c b/sdk-modifications/libsrc/zlib/infback.c
index 981aff1..981aff1 100644..100755
--- a/sdk-modifications/libsrc/zlib/infback.c
+++ b/sdk-modifications/libsrc/zlib/infback.c
diff --git a/sdk-modifications/libsrc/zlib/inffast.c b/sdk-modifications/libsrc/zlib/inffast.c
index 2f1d60b..2f1d60b 100644..100755
--- a/sdk-modifications/libsrc/zlib/inffast.c
+++ b/sdk-modifications/libsrc/zlib/inffast.c
diff --git a/sdk-modifications/libsrc/zlib/inffast.h b/sdk-modifications/libsrc/zlib/inffast.h
index e5c1aa4..e5c1aa4 100644..100755
--- a/sdk-modifications/libsrc/zlib/inffast.h
+++ b/sdk-modifications/libsrc/zlib/inffast.h
diff --git a/sdk-modifications/libsrc/zlib/inffixed.h b/sdk-modifications/libsrc/zlib/inffixed.h
index d628327..d628327 100644..100755
--- a/sdk-modifications/libsrc/zlib/inffixed.h
+++ b/sdk-modifications/libsrc/zlib/inffixed.h
diff --git a/sdk-modifications/libsrc/zlib/inflate.c b/sdk-modifications/libsrc/zlib/inflate.c
index cc89517..cc89517 100644..100755
--- a/sdk-modifications/libsrc/zlib/inflate.c
+++ b/sdk-modifications/libsrc/zlib/inflate.c
diff --git a/sdk-modifications/libsrc/zlib/inflate.h b/sdk-modifications/libsrc/zlib/inflate.h
index 95f4986..95f4986 100644..100755
--- a/sdk-modifications/libsrc/zlib/inflate.h
+++ b/sdk-modifications/libsrc/zlib/inflate.h
diff --git a/sdk-modifications/libsrc/zlib/inftrees.c b/sdk-modifications/libsrc/zlib/inftrees.c
index 60bbd58..60bbd58 100644..100755
--- a/sdk-modifications/libsrc/zlib/inftrees.c
+++ b/sdk-modifications/libsrc/zlib/inftrees.c
diff --git a/sdk-modifications/libsrc/zlib/inftrees.h b/sdk-modifications/libsrc/zlib/inftrees.h
index baa53a0..baa53a0 100644..100755
--- a/sdk-modifications/libsrc/zlib/inftrees.h
+++ b/sdk-modifications/libsrc/zlib/inftrees.h
diff --git a/sdk-modifications/libsrc/zlib/trees.c b/sdk-modifications/libsrc/zlib/trees.c
index 8c32b21..8c32b21 100644..100755
--- a/sdk-modifications/libsrc/zlib/trees.c
+++ b/sdk-modifications/libsrc/zlib/trees.c
diff --git a/sdk-modifications/libsrc/zlib/trees.h b/sdk-modifications/libsrc/zlib/trees.h
index d35639d..d35639d 100644..100755
--- a/sdk-modifications/libsrc/zlib/trees.h
+++ b/sdk-modifications/libsrc/zlib/trees.h
diff --git a/sdk-modifications/libsrc/zlib/uncompr.c b/sdk-modifications/libsrc/zlib/uncompr.c
index ad98be3..ad98be3 100644..100755
--- a/sdk-modifications/libsrc/zlib/uncompr.c
+++ b/sdk-modifications/libsrc/zlib/uncompr.c
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 <sys/types.h> /* 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 <sys/types.h> /* for off_t */
# endif
#endif
diff --git a/sdk-modifications/libsrc/zlib/zlib.h b/sdk-modifications/libsrc/zlib/zlib.h
index 79142d1..79142d1 100644..100755
--- a/sdk-modifications/libsrc/zlib/zlib.h
+++ b/sdk-modifications/libsrc/zlib/zlib.h
diff --git a/sdk-modifications/libsrc/zlib/zlib.mk b/sdk-modifications/libsrc/zlib/zlib.mk
index 94ea103..94ea103 100644..100755
--- a/sdk-modifications/libsrc/zlib/zlib.mk
+++ b/sdk-modifications/libsrc/zlib/zlib.mk
diff --git a/sdk-modifications/libsrc/zlib/zutil.c b/sdk-modifications/libsrc/zlib/zutil.c
index 8a1d242..8a1d242 100644..100755
--- a/sdk-modifications/libsrc/zlib/zutil.c
+++ b/sdk-modifications/libsrc/zlib/zutil.c
diff --git a/sdk-modifications/libsrc/zlib/zutil.h b/sdk-modifications/libsrc/zlib/zutil.h
index d8575e0..d8575e0 100644..100755
--- a/sdk-modifications/libsrc/zlib/zutil.h
+++ b/sdk-modifications/libsrc/zlib/zutil.h