diff --git a/Makefile.ngc b/Makefile.ngc index 63c46fc61e..9cfb1fd1e1 100644 --- a/Makefile.ngc +++ b/Makefile.ngc @@ -29,7 +29,7 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT) DOL_TARGET := retroarch_ngc.dol ELF_TARGET := retroarch_ngc.elf -INCLUDE := -I. -I$(DEVKITPRO)/libogc/include +INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ideps/rzlib LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L. MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float diff --git a/Makefile.ps3 b/Makefile.ps3 index d036447392..6b3ef6f2e9 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -35,7 +35,7 @@ EBOOT_PATH = ps3/pkg/USRDIR/EBOOT.BIN CORE_PATH = ps3/pkg/USRDIR/cores/CORE.SELF LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -INCDIRS = -I. -Ips3 -Icommon +INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib # system platform system_platform = unix diff --git a/Makefile.wii b/Makefile.wii index d149a0c5ce..455935952e 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -29,7 +29,7 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT) DOL_TARGET := retroarch_wii.dol ELF_TARGET := retroarch_wii.elf -INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/ogc +INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/ogc -Ideps/rzlib LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L. MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float diff --git a/deps/rzlib/ioapi.c b/deps/rzlib/ioapi.c index d71f82309a..460f0d5255 100644 --- a/deps/rzlib/ioapi.c +++ b/deps/rzlib/ioapi.c @@ -14,12 +14,6 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__APPLE__) || defined(__CELLOS_LV2__) -#define fopen64 fopen -#define ftello64 ftell -#define fseeko64 fseek -#endif - #include "ioapi.h" voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) @@ -194,7 +188,7 @@ static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T } ret = 0; - if(fseeko64((FILE *)stream, offset, fseek_origin) != 0) + if(fseek((FILE *)stream, offset, fseek_origin) != 0) ret = -1; return ret; diff --git a/file_extract.c b/file_extract.c index ea9207bfb1..bd9c081aa9 100644 --- a/file_extract.c +++ b/file_extract.c @@ -20,11 +20,7 @@ #include #include -#ifdef WANT_MINIZ -#include "deps/rzlib/zlib.h" -#else #include -#endif #include "hash.h" diff --git a/gfx/rpng/rpng.c b/gfx/rpng/rpng.c index 5d9c73fe68..8fad551aa4 100644 --- a/gfx/rpng/rpng.c +++ b/gfx/rpng/rpng.c @@ -15,11 +15,7 @@ #include "rpng.h" -#ifdef WANT_MINIZ -#include "../../deps/miniz/zlib.h" -#else #include -#endif #include #include diff --git a/hash.h b/hash.h index 348a2352c6..cbc0ea5eb6 100644 --- a/hash.h +++ b/hash.h @@ -28,11 +28,8 @@ void sha256_hash(char *out, const uint8_t *in, size_t size); #ifdef HAVE_ZLIB -#ifdef WANT_MINIZ -#include "deps/rzlib/zlib.h" -#else #include -#endif + static inline uint32_t crc32_calculate(const uint8_t *data, size_t length) { return crc32(0, data, length); diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index 8d6262c961..ecbd57e378 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -101,7 +101,7 @@ Level3 Disabled WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp Fast @@ -121,7 +121,7 @@ Level3 Disabled WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp Fast @@ -143,7 +143,7 @@ true true WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp Fast @@ -167,7 +167,7 @@ true true WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_ZLIB;WANT_MINIZ;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(CG_INC_PATH);%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp Fast