notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: rework block tracking
[pcsx_rearmed.git]
/
plugins
/
cdrcimg
/
cdrcimg.c
diff --git
a/plugins/cdrcimg/cdrcimg.c
b/plugins/cdrcimg/cdrcimg.c
index
91cf1ca
..
9a74908
100644
(file)
--- a/
plugins/cdrcimg/cdrcimg.c
+++ b/
plugins/cdrcimg/cdrcimg.c
@@
-14,7
+14,9
@@
#include <zlib.h>
#ifndef _WIN32
#define CALLBACK
#include <zlib.h>
#ifndef _WIN32
#define CALLBACK
+#ifndef NO_DYLIB
#include <dlfcn.h>
#include <dlfcn.h>
+#endif
#else
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@
-285,7
+287,7
@@
static long CDRinit(void)
return -1;
}
}
return -1;
}
}
-#if
ndef _WIN32
+#if
!defined(_WIN32) && !defined(NO_DYLIB)
if (pBZ2_bzBuffToBuffDecompress == NULL) {
void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY);
if (h == NULL)
if (pBZ2_bzBuffToBuffDecompress == NULL) {
void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY);
if (h == NULL)
@@
-415,6
+417,8
@@
static long CDRopen(void)
char *ext;
FILE *f = NULL;
char *ext;
FILE *f = NULL;
+ printf("%s cd_file=%d\n", __func__, cd_file == NULL ? 0 : 1);
+
if (cd_file != NULL)
return 0; // it's already open
if (cd_file != NULL)
return 0; // it's already open