X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fcdrcimg%2Fcdrcimg.c;h=47371aa9b11cecbdfb638158e43b3e1d912f6460;hb=9766e77ddec3157cbf8b7da407b99f47467a8f72;hp=dd1cf57bca84769aa6e8d71f40838f8b17ede44e;hpb=bb5cf0fcf7abafa7648734696320d5fa3bdb1e0a;p=pcsx_rearmed.git

diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index dd1cf57b..47371aa9 100644
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -12,8 +12,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <zlib.h>
-#include <bzlib.h>
+#ifndef _WIN32
+#define CALLBACK
+#ifndef NO_DYLIB
 #include <dlfcn.h>
+#endif
+#else
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 
 #include "cdrcimg.h"
 
@@ -45,12 +52,12 @@ static struct {
 static int current_block, current_sect_in_blk;
 
 struct CdrStat;
-extern long CDR__getStatus(struct CdrStat *stat);
+extern long CALLBACK CDR__getStatus(struct CdrStat *stat);
 
 struct CdrStat
 {
-	unsigned long Type;
-	unsigned long Status;
+	unsigned int Type;
+	unsigned int Status;
 	unsigned char Time[3]; // current playing time
 };
 
@@ -212,7 +219,7 @@ static long CDRreadTrack(unsigned char *time)
 	}
 	if (cdbuffer_size != sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk)
 		err("cdbuffer_size: %lu != %d, sector %d\n", cdbuffer_size,
-			sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk, sector);
+			(int)sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk, sector);
 
 	// done at last!
 	current_block = block;
@@ -280,6 +287,7 @@ static long CDRinit(void)
 			return -1;
 		}
 	}
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 	if (pBZ2_bzBuffToBuffDecompress == NULL) {
 		void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY);
 		if (h == NULL)
@@ -292,6 +300,7 @@ static long CDRinit(void)
 			}
 		}
 	}
+#endif
 	return 0;
 }