From a5ab9ad28fb7f17deac6bcba3da2f407571ac844 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Fri, 27 Feb 2009 06:27:23 +0000 Subject: [PATCH] Linuz CDVD Iso: Fix a major Linux bug that was preventing certain titles from loading in this plugin. Dark Cloud 2, Atelier Iris 3, and Xenosaga I for example. No more switching back and forth between Linuz and EFP. :) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@626 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/CDVDiso/src/Linux/Makefile | 2 +- plugins/CDVDiso/src/libiso.c | 8 ++++---- plugins/CDVDiso/src/mkiso/Makefile | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/CDVDiso/src/Linux/Makefile b/plugins/CDVDiso/src/Linux/Makefile index 8251fa19c1..02eeaea008 100644 --- a/plugins/CDVDiso/src/Linux/Makefile +++ b/plugins/CDVDiso/src/Linux/Makefile @@ -4,7 +4,7 @@ CC = gcc PLUGIN = libCDVDiso.so CFG = cfgCDVDiso MKISO = mkiso -CFLAGS = -fPIC -Wall -g -I.. -I. -D__LINUX__ +CFLAGS = -fPIC -Wall -g -I.. -I. -D__LINUX__ -D_FILE_OFFSET_BITS=64 -Wextra OBJS = ../CDVDisop.o Config.o Linux.o ../libiso.o CFGOBJS = conf.o interface.o support.o ${OBJS} LIBS = -lz -lbz2 -lstdc++ diff --git a/plugins/CDVDiso/src/libiso.c b/plugins/CDVDiso/src/libiso.c index 51b7bdb3d0..037ef330ea 100644 --- a/plugins/CDVDiso/src/libiso.c +++ b/plugins/CDVDiso/src/libiso.c @@ -1,6 +1,8 @@ #define __USE_LARGEFILE64 #define __USE_FILE_OFFSET64 #define _FILE_OFFSET_BITS 64 +#define _LARGEFILE_SOURCE +#define _LARGEFILE64_SOURCE #ifdef _WIN32 #include @@ -187,7 +189,7 @@ void *_openfile(const char *filename, int flags) u64 _tellfile(void *handle) { - u64 cursize = ftell(handle); + s64 cursize = ftell(handle); if (cursize == -1) { // try 64bit @@ -283,9 +285,7 @@ int _isoReadZ2table(isoFile *iso) void *handle; char table[256]; u32 *Ztable; - int ofs; - int size; - int i; + int ofs, size, i; sprintf(table, "%s.table", iso->filename); handle = _openfile(table, O_RDONLY); diff --git a/plugins/CDVDiso/src/mkiso/Makefile b/plugins/CDVDiso/src/mkiso/Makefile index 317097597a..90beb81202 100644 --- a/plugins/CDVDiso/src/mkiso/Makefile +++ b/plugins/CDVDiso/src/mkiso/Makefile @@ -2,12 +2,12 @@ CC = gcc MKISO = mkiso -CFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -I.. -I. -D__LINUX__ -I../3rdparty/zlib +CFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -I.. -I. -D__LINUX__ -I../../../../3rdparty/zlib -D_FILE_OFFSET_BITS=64 OBJS = mkiso.o ../libiso.o LIBS = -OBJS+= ../3rdparty/zlib/adler32.o ../3rdparty/zlib/compress.o ../3rdparty/zlib/crc32.o ../3rdparty/zlib/gzio.o ../3rdparty/zlib/uncompr.o \ -../3rdparty/zlib/deflate.o ../3rdparty/zlib/trees.o ../3rdparty/zlib/zutil.o ../3rdparty/zlib/inflate.o ../3rdparty/zlib/infback.o ../3rdparty/zlib/inftrees.o \ -../3rdparty/zlib/inffast.o +OBJS+= ../../../../3rdparty/zlib/adler32.o ../../../../3rdparty/zlib/compress.o ../../../../3rdparty/zlib/crc32.o ../../../../3rdparty/zlib/gzio.o \ +../../../../3rdparty/zlib/uncompr.o ../../../../3rdparty/zlib/deflate.o ../../../../3rdparty/zlib/trees.o ../../../../3rdparty/zlib/zutil.o \ +../../../../3rdparty/zlib/inflate.o ../../../../3rdparty/zlib/infback.o ../../../../3rdparty/zlib/inftrees.o ../../../../3rdparty/zlib/inffast.o DEPS:= $(OBJS:.o=.d)