|
Mystro256 |
7ac66ae |
diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac
|
|
Mystro256 |
7ac66ae |
index 300bb18..128b4f9 100644
|
|
Mystro256 |
7ac66ae |
--- a/configure.ac
|
|
Mystro256 |
7ac66ae |
+++ b/configure.ac
|
|
Mystro256 |
7ac66ae |
@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then
|
|
Mystro256 |
7ac66ae |
AC_MSG_ERROR([unable to find xtest headers])
|
|
Mystro256 |
7ac66ae |
fi
|
|
Mystro256 |
7ac66ae |
|
|
Mystro256 |
7ac66ae |
+AC_CHECK_LIB(z, uncompress2,
|
|
Mystro256 |
7ac66ae |
+[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ])
|
|
Mystro256 |
7ac66ae |
+
|
|
Mystro256 |
7ac66ae |
AM_CONDITIONAL(USE_LIBCDIO, false)
|
|
Mystro256 |
7ac66ae |
|
|
Mystro256 |
7ac66ae |
AC_ARG_ENABLE(libcdio, [ --enable-libcdio use GNU libcdio for CD-ROM support (default=no)],
|
|
Mystro256 |
7ac66ae |
diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c
|
|
Mystro256 |
7ac66ae |
index 04e866d..fb7f28a 100644
|
|
Mystro256 |
7ac66ae |
--- a/libpcsxcore/cdriso.c
|
|
Mystro256 |
7ac66ae |
+++ b/libpcsxcore/cdriso.c
|
|
Mystro256 |
7ac66ae |
@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
|
|
Mystro256 |
7ac66ae |
return ret;
|
|
Mystro256 |
7ac66ae |
}
|
|
Mystro256 |
7ac66ae |
|
|
Mystro256 |
7ac66ae |
+#ifndef HAVE_UNCOMPRESS2
|
|
Mystro256 |
7ac66ae |
static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
|
|
Mystro256 |
7ac66ae |
{
|
|
Mystro256 |
7ac66ae |
static z_stream z;
|
|
Mystro256 |
7ac66ae |
@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo
|
|
Mystro256 |
7ac66ae |
*out_size -= z.avail_out;
|
|
Mystro256 |
7ac66ae |
return ret == 1 ? 0 : ret;
|
|
Mystro256 |
7ac66ae |
}
|
|
Mystro256 |
7ac66ae |
+#endif
|
|
Mystro256 |
7ac66ae |
|
|
Mystro256 |
7ac66ae |
static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
|
|
Mystro256 |
7ac66ae |
{
|