mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 19:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(MSVC) Add 7zip support - build fixes to do with casting pointers

Browse Source 
explicitly
This commit is contained in:
twinaphex 2014-09-12 21:50:57 +02:00
parent 119a51be76
commit 98fd04d970
4 changed files with 86 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decompress/7zip_support.c
View File

@ -134,7 +134,7 @@ static SRes Utf16_To_Char(CBuf *buf, const UInt16 *s, int fileMode)
AreFileApisANSI() ? CP_ACP : CP_OEMCP
#endif
) : CP_OEMCP,
0, s, len, (char *)buf->data, size, &defaultChar, &defUsed);
0, (LPCWSTR)s, len, (char *)buf->data, size, &defaultChar, &defUsed);
if (numChars == 0 || numChars >= size)
return SZ_ERROR_FAIL;
buf->data[numChars] = 0;

2
decompress/zip_support.c
View File

@ -35,7 +35,7 @@ int read_zip_file(const char * archive_path, const char *relative_path, void **b
{
size_t bytes_read = -1;
bool finished_reading = false;
unzFile *zipfile = unzOpen( archive_path );
unzFile *zipfile = (unzFile*)unzOpen( archive_path );
if ( ! zipfile )
{
RARCH_ERR("Could not open zipfile %s.\n",archive_path);

23
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -100,7 +100,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);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_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);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_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_COMPRESSION;HAVE_7ZIP;_7ZIP_ST</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
@ -142,7 +142,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);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_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;HAVE_CC_RESAMPLER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);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_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_COMPRESSION;HAVE_7ZIP;_7ZIP_ST</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
@ -202,6 +202,25 @@
<ClCompile Include="..\..\cheats.c" />
<ClCompile Include="..\..\compat\rxml\rxml.c" />
<ClCompile Include="..\..\core_options.c" />
<ClCompile Include="..\..\decompress\7zip_support.c" />
<ClCompile Include="..\..\decompress\zip_support.c" />
<ClCompile Include="..\..\deps\7zip\7zAlloc.c" />
<ClCompile Include="..\..\deps\7zip\7zBuf.c" />
<ClCompile Include="..\..\deps\7zip\7zBuf2.c" />
<ClCompile Include="..\..\deps\7zip\7zCrc.c" />
<ClCompile Include="..\..\deps\7zip\7zCrcOpt.c" />
<ClCompile Include="..\..\deps\7zip\7zDec.c" />
<ClCompile Include="..\..\deps\7zip\7zFile.c" />
<ClCompile Include="..\..\deps\7zip\7zIn.c" />
<ClCompile Include="..\..\deps\7zip\7zStream.c" />
<ClCompile Include="..\..\deps\7zip\Bcj2.c" />
<ClCompile Include="..\..\deps\7zip\Bra.c" />
<ClCompile Include="..\..\deps\7zip\Bra86.c" />
<ClCompile Include="..\..\deps\7zip\CpuArch.c" />
<ClCompile Include="..\..\deps\7zip\Lzma2Dec.c" />
<ClCompile Include="..\..\deps\7zip\LzmaDec.c" />
<ClCompile Include="..\..\deps\7zip\Ppmd7.c" />
<ClCompile Include="..\..\deps\7zip\Ppmd7Dec.c" />
<ClCompile Include="..\..\deps\rzlib\adler32.c" />
<ClCompile Include="..\..\deps\rzlib\compress.c" />
<ClCompile Include="..\..\deps\rzlib\crc32.c" />

63
msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
View File

@ -262,6 +262,63 @@
<ClCompile Include="..\..\gfx\d3d9\d3d_wrapper.c">
<Filter>gfx\d3d9</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zAlloc.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zBuf.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zBuf2.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zCrc.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zCrcOpt.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zDec.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zFile.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zIn.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\7zStream.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\Bcj2.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\Bra.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\Bra86.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\CpuArch.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\Lzma2Dec.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\LzmaDec.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\Ppmd7.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\7zip\Ppmd7Dec.c">
<Filter>deps\lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\decompress\7zip_support.c">
<Filter>decompress</Filter>
</ClCompile>
<ClCompile Include="..\..\decompress\zip_support.c">
<Filter>decompress</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
@ -490,5 +547,11 @@
<Filter Include="record">
<UniqueIdentifier>{5a80dd03-b4d7-4118-92ff-55a601fd80fc}</UniqueIdentifier>
</Filter>
<Filter Include="decompress">
<UniqueIdentifier>{5b5cc9ef-5f96-42bb-9690-d97593954ef1}</UniqueIdentifier>
</Filter>
<Filter Include="deps\lzma">
<UniqueIdentifier>{fdbc97c0-7581-475f-89ec-40081267f22c}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>