(Rzlib) Rename szlib to Rzlib

This commit is contained in:
Twinaphex 2012-05-06 03:58:29 +02:00
parent 5107eb4fe3
commit 20a1d5df29
9 changed files with 13 additions and 18 deletions

View File

@ -46,7 +46,7 @@ GIT = git.exe
endif endif
PPU_SRCS = console/griffin/griffin.c \ PPU_SRCS = console/griffin/griffin.c \
console/szlib/szlib.c console/rzlib/rzlib.c
ifeq ($(HAVE_RGL), 1) ifeq ($(HAVE_RGL), 1)
DEFINES = -DHAVE_RGL DEFINES = -DHAVE_RGL

View File

@ -26,7 +26,7 @@ CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
LDFLAGS := $(MACHDEP) LDFLAGS := $(MACHDEP)
LIBS := -lfat -lretro -lwiiuse -logc -lbte -lfreetype LIBS := -lfat -lretro -lwiiuse -logc -lbte -lfreetype
OBJ = console/griffin/griffin.o console/font.bmpobj console/szlib/szlib.o OBJ = console/griffin/griffin.o console/font.bmpobj console/rzlib/rzlib.o
ifeq ($(HAVE_LOGGER), 1) ifeq ($(HAVE_LOGGER), 1)
CFLAGS += -DHAVE_LOGGER CFLAGS += -DHAVE_LOGGER

View File

@ -28,7 +28,7 @@
#include "../file.h" #include "../file.h"
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
#include "szlib/zlib.h" #include "rzlib/zlib.h"
#define WRITEBUFFERSIZE (1024 * 512) #define WRITEBUFFERSIZE (1024 * 512)
#endif #endif

View File

@ -1,8 +1,3 @@
/* infcodes.c -- process literals and length/distance pairs
* Copyright (C) 1995-2002 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* This source as presented is a modified version of original zlib for use /* This source as presented is a modified version of original zlib for use
* with RetroArch, and must not be confused with the original software. */ * with RetroArch, and must not be confused with the original software. */

View File

@ -6,8 +6,8 @@
/* This source as presented is a modified version of original zlib for use with /* This source as presented is a modified version of original zlib for use with
* RetroArch, and must not be confused with the original software. */ * RetroArch, and must not be confused with the original software. */
#ifndef _SZLIB_H #ifndef _RZLIB_H
#define _SZLIB_H #define _RZLIB_H
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -682,4 +682,4 @@ extern int unzSetOffset (unzFile file, unsigned long pos);
} }
#endif #endif
#endif /* _SZLIB_H */ #endif /* _RZLIB_H */

2
hash.h
View File

@ -23,7 +23,7 @@
void sha256_hash(char *out, const uint8_t *in, size_t size); void sha256_hash(char *out, const uint8_t *in, size_t size);
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
#include "console/szlib/zlib.h" #include "console/rzlib/zlib.h"
static inline uint32_t crc32_calculate(const uint8_t *data, size_t length) static inline uint32_t crc32_calculate(const uint8_t *data, size_t length)
{ {
return crc32(0, data, length); return crc32(0, data, length);

View File

@ -349,7 +349,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\console\griffin\griffin.c" /> <ClCompile Include="..\..\console\griffin\griffin.c" />
<ClCompile Include="..\..\console\szlib\szlib.c"> <ClCompile Include="..\..\console\rzlib\rzlib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@ -650,4 +650,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

View File

@ -24,7 +24,7 @@
<Filter Include="Source Files\console"> <Filter Include="Source Files\console">
<UniqueIdentifier>{e45d1737-2bab-4209-87c0-3d66cf3aee07}</UniqueIdentifier> <UniqueIdentifier>{e45d1737-2bab-4209-87c0-3d66cf3aee07}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\console\szlib"> <Filter Include="Source Files\console\rzlib">
<UniqueIdentifier>{60603fec-c1c0-4562-8573-b1dc3af0ee40}</UniqueIdentifier> <UniqueIdentifier>{60603fec-c1c0-4562-8573-b1dc3af0ee40}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\media\shader"> <Filter Include="Source Files\media\shader">
@ -44,8 +44,8 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\console\szlib\szlib.c"> <ClCompile Include="..\..\console\rzlib\rzlib.c">
<Filter>Source Files\console\szlib</Filter> <Filter>Source Files\console\rzlib</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\console\griffin\griffin.c"> <ClCompile Include="..\..\console\griffin\griffin.c">
<Filter>Source Files\console\griffin</Filter> <Filter>Source Files\console\griffin</Filter>
@ -187,4 +187,4 @@
<Filter>Source Files\media</Filter> <Filter>Source Files\media</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
</Project> </Project>